hvmloader: Formatting cleanups.

Signed-off-by: Keir Fraser <keir@xen.org>

8 files changed, 56 insertions, 46 deletions

diff --git a/tools/firmware/hvmloader/e820.c b/tools/firmware/hvmloader/e820.c
index 3184856842..8e68e8c9a3 100644
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -91,7 +91,8 @@ int build_e820_table(struct e820entry *e820,
 
     ASSERT ( bios_image_base < 0x100000 );
 
-    if ( lowmem_reserved_base < ACPI_INFO_PHYSICAL_ADDRESS ) {
+    if ( lowmem_reserved_base < ACPI_INFO_PHYSICAL_ADDRESS )
+    {
         /*
          * 0x0-lowmem_reserved_base: Ordinary RAM.
          */
diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index d7b8078b00..4613a736f4 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -408,23 +408,24 @@ int main(void)
 
     perform_tests();
 
-    if (bios->bios_info_setup)
+    if ( bios->bios_info_setup )
         bios->bios_info_setup();
 
-    if (bios->create_smbios_tables) {
+    if ( bios->create_smbios_tables )
+    {
         printf("Writing SMBIOS tables ...\n");
         bios->create_smbios_tables();
     }
 
-    if (bios->bios_load) {
+    printf("Loading %s ...\n", bios->name);
+    if ( bios->bios_load )
         bios->bios_load(bios);
-    } else {
-        printf("Loading %s ...\n", bios->name);
+    else
         memcpy((void *)bios->bios_address, bios->image,
                bios->image_size);
-    }
 
-    if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode ) {
+    if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode )
+    {
         if ( bios->create_mp_tables )
             bios->create_mp_tables();
         if ( bios->create_pir_tables )
@@ -476,14 +477,16 @@ int main(void)
             .value = 1,
         };
 
-        if ( bios->acpi_build_tables ) {
+        if ( bios->acpi_build_tables )
+        {
             printf("Loading ACPI ...\n");
             bios->acpi_build_tables();
         }
+
         hypercall_hvm_op(HVMOP_set_param, &p);
     }
 
-    if (bios->vm86_setup)
+    if ( bios->vm86_setup )
         bios->vm86_setup();
 
     cmos_write_memory_size();
@@ -508,10 +511,10 @@ int main(void)
            bios->bios_address,
            bios->bios_address + bios->image_size - 1);
 
-    if (bios->e820_setup)
+    if ( bios->e820_setup )
         bios->e820_setup();
 
-    if (bios->bios_info_finish)
+    if ( bios->bios_info_finish )
         bios->bios_info_finish();
 
     xenbus_shutdown();
diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c
index ee88db5965..2960627714 100644
--- a/tools/firmware/hvmloader/mp_tables.c
+++ b/tools/firmware/hvmloader/mp_tables.c
@@ -211,7 +211,8 @@ static void fill_mp_proc_entry(struct mp_proc_entry *mppe, int vcpu_id)
 
 
 /* fills in an MP bus entry of type 'type' and bus ID 'bus_id' */
-static void fill_mp_bus_entry(struct mp_bus_entry *mpbe, int bus_id, const char *type)
+static void fill_mp_bus_entry(
+    struct mp_bus_entry *mpbe, int bus_id, const char *type)
 {
     int i;
 
@@ -272,7 +273,8 @@ unsigned long create_mp_tables(void *_mpfps)
 
     printf("Creating MP tables ...\n");
 
-    if (!_mpfps) {
+    if ( _mpfps == NULL )
+    {
         int sz;
 
         sz  = sizeof(struct mp_floating_pointer_struct);
@@ -282,7 +284,7 @@ unsigned long create_mp_tables(void *_mpfps)
         sz += sizeof(struct mp_ioapic_entry);
         sz += sizeof(struct mp_io_intr_entry) * 16;
 
-        base = mem_alloc(sz, 0);
+        _mpfps = mem_alloc(sz, 0);
     }
 
     mpfps = _mpfps;
diff --git a/tools/firmware/hvmloader/pir.c b/tools/firmware/hvmloader/pir.c
index 2d265da195..893718c9db 100644
--- a/tools/firmware/hvmloader/pir.c
+++ b/tools/firmware/hvmloader/pir.c
@@ -23,7 +23,8 @@
  */
 unsigned long create_pir_tables(void)
 {
-    int length = sizeof(struct pir_table) + sizeof(struct pir_slot)*NR_PIR_SLOTS;
+    int length = sizeof(struct pir_table)
+        + sizeof(struct pir_slot) * NR_PIR_SLOTS;
     struct pir_table *pir = scratch_alloc(length, 0);
     int i, checksum;
 
@@ -57,10 +58,8 @@ unsigned long create_pir_tables(void)
     }
 
     checksum = 0;
-    for ( i = 0; i < length; i++)
-    {
+    for ( i = 0; i < length; i++ )
         checksum += ((int8_t *)pir)[i];
-    }
     pir->checksum = -checksum;
 
     return (unsigned long)pir;
diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c
index 632ab87c45..ba2718f2da 100644
--- a/tools/firmware/hvmloader/rombios.c
+++ b/tools/firmware/hvmloader/rombios.c
@@ -86,7 +86,6 @@ static void rombios_load(const struct bios_config *config)
     uint32_t bioshigh;
     struct rombios_info *info;
 
-    printf("Loading %s ...\n", config->name);
     memcpy((void *)config->bios_address, config->image,
            config->image_size);
 
@@ -110,7 +109,7 @@ static void *get_mp_table_start(void)
           bios_mem != (char *)ROMBIOS_END;
           bios_mem++ )
     {
-        if ( strncmp(bios_mem, "___HVMMP", 8) == 0)
+        if ( strncmp(bios_mem, "___HVMMP", 8) == 0 )
             return bios_mem;
     }
 
@@ -124,7 +123,7 @@ static void reset_bios_checksum(void)
     uint8_t checksum;
 
     checksum = 0;
-    for (i = 0; i < ROMBIOS_MAXOFFSET; ++i)
+    for ( i = 0; i < ROMBIOS_MAXOFFSET; i++ )
         checksum += ((uint8_t *)(ROMBIOS_BEGIN))[i];
 
     *((uint8_t *)(ROMBIOS_BEGIN + ROMBIOS_MAXOFFSET)) = -checksum;
@@ -153,9 +152,10 @@ static void rombios_create_mp_tables(void)
 
 static void rombios_create_smbios_tables(void)
 {
-    hvm_write_smbios_tables(SMBIOS_PHYSICAL_ADDRESS,
-                            SMBIOS_PHYSICAL_ADDRESS + sizeof(struct smbios_entry_point),
-                            SMBIOS_PHYSICAL_END);
+    hvm_write_smbios_tables(
+        SMBIOS_PHYSICAL_ADDRESS,
+        SMBIOS_PHYSICAL_ADDRESS + sizeof(struct smbios_entry_point),
+        SMBIOS_PHYSICAL_END);
 }
 
 //BUILD_BUG_ON(sizeof(rombios) > (0x00100000U - ROMBIOS_PHYSICAL_ADDRESS));
diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c
index e1ce5552d1..c633875415 100644
--- a/tools/firmware/hvmloader/seabios.c
+++ b/tools/firmware/hvmloader/seabios.c
@@ -71,7 +71,7 @@ static void seabios_finish_bios_info(void)
     uint8_t checksum;
 
     checksum = 0;
-    for (i = 0; i < info->length; ++i)
+    for ( i = 0; i < info->length; i++ )
         checksum += ((uint8_t *)(info))[i];
 
     info->checksum = -checksum;
diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c
index cfc8595707..5674bf42c0 100644
--- a/tools/firmware/hvmloader/smbios.c
+++ b/tools/firmware/hvmloader/smbios.c
@@ -77,9 +77,9 @@ get_cpu_manufacturer(char *buf, int len)
     cpuid(0, &eax, (uint32_t *)&id[0], (uint32_t *)&id[8],
           (uint32_t *)&id[4]);
 
-    if (memcmp(id, "GenuineIntel", 12) == 0)
+    if ( memcmp(id, "GenuineIntel", 12) == 0 )
         strncpy(buf, "Intel", len);
-    else if (memcmp(id, "AuthenticAMD", 12) == 0)
+    else if ( memcmp(id, "AuthenticAMD", 12) == 0 )
         strncpy(buf, "AMD", len);
     else
         strncpy(buf, "unknown", len);
@@ -158,7 +158,8 @@ get_memsize(void)
 }
 
 void
-hvm_write_smbios_tables(unsigned long ep, unsigned long smbios_start, unsigned long smbios_end)
+hvm_write_smbios_tables(
+    unsigned long ep, unsigned long smbios_start, unsigned long smbios_end)
 {
     xen_domain_handle_t uuid;
     uint16_t xen_major_version, xen_minor_version;
@@ -232,7 +233,8 @@ hvm_write_smbios_tables(unsigned long ep, unsigned long smbios_start, unsigned l
 
     memcpy((void *)smbios_start, (void *)scratch_start, len);
 
-    smbios_entry_point_init((void *)ep, max_struct_size, len, smbios_start, nr_structs);
+    smbios_entry_point_init(
+        (void *)ep, max_struct_size, len, smbios_start, nr_structs);
 
     return;
 
@@ -313,12 +315,14 @@ smbios_type_0_init(void *start, const char *xen_version,
     p->embedded_controller_minor = 0xff;
 
     start += sizeof(struct smbios_type_0);
-    if ((s = xenstore_read("bios-strings/bios-vendor")) == NULL || *s == '\0')
+    if ( ((s = xenstore_read("bios-strings/bios-vendor")) == NULL)
+         || (*s == '\0') )
         s = "Xen";
     strcpy((char *)start, s);
     start += strlen(s) + 1;
 
-    if ((s = xenstore_read("bios-strings/bios-version")) == NULL || *s == '\0')
+    if ( ((s = xenstore_read("bios-strings/bios-version")) == NULL)
+         || (*s == '\0') )
         s = xen_version;
     strcpy((char *)start, s);
     start += strlen(s) + 1;
@@ -358,27 +362,27 @@ smbios_type_1_init(void *start, const char *xen_version,
 
     start += sizeof(struct smbios_type_1);
     
-    if ((s = xenstore_read("bios-strings/system-manufacturer")) == NULL  
-        || *s == '\0')
+    if ( ((s = xenstore_read("bios-strings/system-manufacturer")) == NULL)
+         || (*s == '\0') )
         s = "Xen";
     strcpy((char *)start, s);
     start += strlen(s) + 1;
 
-    if ((s = xenstore_read("bios-strings/system-product-name")) == NULL
-         || *s == '\0')
+    if ( ((s = xenstore_read("bios-strings/system-product-name")) == NULL)
+         || (*s == '\0') )
         s = "HVM domU";
     strcpy((char *)start, s);
     start += strlen(s) + 1;
 
-    if ((s = xenstore_read("bios-strings/system-version")) == NULL
-        || *s == '\0')
+    if ( ((s = xenstore_read("bios-strings/system-version")) == NULL)
+         || (*s == '\0') )
         s = xen_version;
     strcpy((char *)start, s);
     start += strlen(s) + 1;
 
     uuid_to_string(uuid_str, uuid); 
-    if ((s = xenstore_read("bios-strings/system-serial-number")) == NULL
-        || *s == '\0')
+    if ( ((s = xenstore_read("bios-strings/system-serial-number")) == NULL)
+         || (*s == '\0') )
         s = uuid_str;
     strcpy((char *)start, s);
     start += strlen(s) + 1;
@@ -486,10 +490,11 @@ smbios_type_11_init(void *start)
     start += sizeof(struct smbios_type_11);
 
     /* Pull out as many oem-* strings we find in xenstore */
-    for (i = 1; i < 100; i++) {
+    for ( i = 1; i < 100; i++ )
+    {
         path[(sizeof path) - 3] = '0' + ((i < 10) ? i : i / 10);
         path[(sizeof path) - 2] = (i < 10) ? '\0' : '0' + (i % 10);
-        if ((s = xenstore_read(path)) == NULL || *s == '\0')
+        if ( ((s = xenstore_read(path)) == NULL) || (*s == '\0') )
             break;
         strcpy((char *)start, s);
         start += strlen(s) + 1;
@@ -497,7 +502,8 @@ smbios_type_11_init(void *start)
     }
     
     /* Make sure there's at least one type-11 string */
-    if (p->count == 0) {
+    if ( p->count == 0 )
+    {
         strcpy((char *)start, "Xen");
         start += strlen("Xen") + 1;
         p->count++;
diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index e000874ec4..bc86043eec 100644
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -199,9 +199,8 @@ uint32_t rombios_highbios_setup(void);
 /* Miscellaneous. */
 void cacheattr_init(void);
 unsigned long create_mp_tables(void *table);
-void hvm_write_smbios_tables(unsigned long ep,
-                             unsigned long smbios_start,
-                             unsigned long smbios_end);
+void hvm_write_smbios_tables(
+    unsigned long ep, unsigned long smbios_start, unsigned long smbios_end);
 unsigned long create_pir_tables(void);
 
 void smp_initialise(void);