diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-14 15:53:04 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:41 +0200 |
| commit | 4dfd8eaa19c90087f19b56da5d04d9c468109a65 (patch) | |
| tree | a4102c1fce302710af9712a433687cad4203b58a /hw/ppc | |
| parent | 42134ac9d74799cf2f70257798b72a2988b75d31 (diff) | |
spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros
SPAPR_COMPAT_2_1 will need to include both HW_COMPAT_2_2 and
HW_COMPAT_2_1, so include HW_COMPAT_2_1 inside SPAPR_COMPAT_2_1 and
HW_COMPAT_2_2 inside SPAPR_COMPAT_2_2.
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>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ee0ec61e33..de1b74052d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1816,6 +1816,7 @@ static const TypeInfo spapr_machine_info = { }; #define SPAPR_COMPAT_2_2 \ + HW_COMPAT_2_2 \ {\ .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .property = "mem_win_size",\ @@ -1823,7 +1824,8 @@ static const TypeInfo spapr_machine_info = { }, #define SPAPR_COMPAT_2_1 \ - SPAPR_COMPAT_2_2 + SPAPR_COMPAT_2_2 \ + HW_COMPAT_2_1 static void spapr_compat_2_3(Object *obj) { @@ -1861,7 +1863,6 @@ 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 SPAPR_COMPAT_2_1 { /* end of list */ } }; |