| Message ID | 20190716153816.17676-6-shameerali.kolothum.thodi@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM virt: ACPI memory hotplug support | expand |
On Tue, 16 Jul 2019 16:38:11 +0100 Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote: > This is in preparation to create ACPI GED device as we > need to disable it for <4.2 for migration to work. > > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > include/hw/boards.h | 3 +++ > 3 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 907fb64bb9..bbe156dc35 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2095,10 +2095,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_4_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) > + > static void virt_machine_4_1_options(MachineClass *mc) > { > + virt_machine_4_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) > +DEFINE_VIRT_MACHINE(4, 1) > > static void virt_machine_4_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index c58a8e594e..a79d4ad740 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -27,6 +27,9 @@ > #include "hw/pci/pci.h" > #include "hw/mem/nvdimm.h" > > +GlobalProperty hw_compat_4_1[] = {}; > +const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); > + > GlobalProperty hw_compat_4_0[] = { > { "VGA", "edid", "false" }, > { "secondary-vga", "edid", "false" }, > diff --git a/include/hw/boards.h b/include/hw/boards.h > index a71d1a53a5..d9ec37d807 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -317,6 +317,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_4_1[]; > +extern const size_t hw_compat_4_1_len; > + > extern GlobalProperty hw_compat_4_0[]; > extern const size_t hw_compat_4_0_len; >
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 907fb64bb9..bbe156dc35 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2095,10 +2095,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_4_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) + static void virt_machine_4_1_options(MachineClass *mc) { + virt_machine_4_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) +DEFINE_VIRT_MACHINE(4, 1) static void virt_machine_4_0_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index c58a8e594e..a79d4ad740 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,9 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +GlobalProperty hw_compat_4_1[] = {}; +const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); + GlobalProperty hw_compat_4_0[] = { { "VGA", "edid", "false" }, { "secondary-vga", "edid", "false" }, diff --git a/include/hw/boards.h b/include/hw/boards.h index a71d1a53a5..d9ec37d807 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -317,6 +317,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_4_1[]; +extern const size_t hw_compat_4_1_len; + extern GlobalProperty hw_compat_4_0[]; extern const size_t hw_compat_4_0_len;
This is in preparation to create ACPI GED device as we need to disable it for <4.2 for migration to work. Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> --- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ include/hw/boards.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-)