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>
This commit is contained in:
parent
42134ac9d7
commit
4dfd8eaa19
|
@ -1816,6 +1816,7 @@ static const TypeInfo spapr_machine_info = {
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SPAPR_COMPAT_2_2 \
|
#define SPAPR_COMPAT_2_2 \
|
||||||
|
HW_COMPAT_2_2 \
|
||||||
{\
|
{\
|
||||||
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\
|
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\
|
||||||
.property = "mem_win_size",\
|
.property = "mem_win_size",\
|
||||||
|
@ -1823,7 +1824,8 @@ static const TypeInfo spapr_machine_info = {
|
||||||
},
|
},
|
||||||
|
|
||||||
#define SPAPR_COMPAT_2_1 \
|
#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)
|
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);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
static GlobalProperty compat_props[] = {
|
static GlobalProperty compat_props[] = {
|
||||||
HW_COMPAT_2_1
|
|
||||||
SPAPR_COMPAT_2_1
|
SPAPR_COMPAT_2_1
|
||||||
{ /* end of list */ }
|
{ /* end of list */ }
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue