hw: Move commas inside HW_COMPAT_2_1 macro

Changing the convention to include commas inside the macros will allow
macros containing empty lists to be defined and used without compilation
errors.

Signed-off-by: Eduardo Habkost <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a8ff6f51c7b8fb631559e6b4ccbc0634543d8080..608539d42ff409aa3eb3cf7c82b3a855e1b3f64b 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -562,7 +562,7 @@ static QEMUMachine pc_i440fx_machine_v2_1 = {
     .name = "pc-i440fx-2.1",
     .init = pc_init_pci_2_1,
     .compat_props = (GlobalProperty[]) {
-        HW_COMPAT_2_1,
+        HW_COMPAT_2_1
         { /* end of list */ }
     },
 };

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index e67f2dead712009de7e07d1565f76b7f31e52f33..36b88349256181a3e811f75fca9ab7640bb3ffa5 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -458,7 +458,7 @@ static QEMUMachine pc_q35_machine_v2_1 = {
     .name = "pc-q35-2.1",
     .init = pc_q35_init_2_1,
     .compat_props = (GlobalProperty[]) {
-        HW_COMPAT_2_1,
+        HW_COMPAT_2_1
         { /* end of list */ }
     },
 };

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ac261ef050e8ad879077dca3ccc2d357c3347441..f768de11fc3753eafdd929268f5cb898313dd4ee 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1861,7 +1861,7 @@ static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
     static GlobalProperty compat_props[] = {
-        HW_COMPAT_2_1,
+        HW_COMPAT_2_1
         SPAPR_COMPAT_2_1,
         { /* end of list */ }
     };

diff --git a/include/hw/compat.h b/include/hw/compat.h
index 313682a708d9116465dfeaf566154ffa9a93ef95..c56a6989be73e7f4eaeb28ee5eda16b3fbb04b76 100644 (file)
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -30,6 +30,6 @@
             .driver   = "virtio-pci",\
             .property = "virtio-pci-bus-master-bug-migration",\
             .value    = "on",\
-        }
+        },
 
 #endif /* HW_COMPAT_H */

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 7ed43f17ecc15b02a56f7cbd43357598e9183b82..7673a4dfce8d918d1ae12832736f9867c252182f 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -296,7 +296,7 @@ int e820_get_num_entries(void);
 bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
 
 #define PC_COMPAT_2_0 \
-        HW_COMPAT_2_1, \
+        HW_COMPAT_2_1 \
         {\
             .driver   = "virtio-scsi-pci",\
             .property = "any_layout",\