ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eduardo Habkost 2015-05-14 15:52:59 -03:00 committed by Michael S. Tsirkin
parent 4974920ab8
commit f27086a731
5 changed files with 5 additions and 5 deletions

2
hw/i386/pc_piix.c
View File

@ -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 */ }
},
};

2
hw/i386/pc_q35.c
View File

@ -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 */ }
},
};

2
hw/ppc/spapr.c
View File

@ -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 */ }
};

2
include/hw/compat.h
View File

@ -30,6 +30,6 @@
.driver = "virtio-pci",\
.property = "virtio-pci-bus-master-bug-migration",\
.value = "on",\
}
},
#endif /* HW_COMPAT_H */

2
include/hw/i386/pc.h
View File

@ -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",\