diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:52:59 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | f27086a731bbd0141646702c95f6dc5fce3e8575 (patch) | |
| tree | fe01ac54bffa49793c3a7ae34a62e03742d14033 | |
| parent | 4974920ab8fc8cf05687f1f764650dbc7c821004 (diff) | |
| download | qemu-f27086a731bbd0141646702c95f6dc5fce3e8575.tar.gz | |
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 <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/i386/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 2 | ||||
| -rw-r--r-- | include/hw/compat.h | 2 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a8ff6f51c7..608539d42f 100644 --- 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 e67f2dead7..36b8834925 100644 --- 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 ac261ef050..f768de11fc 100644 --- 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 313682a708..c56a6989be 100644 --- 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 7ed43f17ec..7673a4dfce 100644 --- 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",\ |