| Message ID | 20201020131440.1090-6-fangying1@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/virt: Introduce cpu and cache topology support | expand |
On Tue, Oct 20, 2020 at 09:14:32PM +0800, Ying Fang wrote: > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. ^ 5.3 Thanks, drew > > Signed-off-by: Ying Fang <fangying1@huawei.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 15 ++++++++++++++- > hw/i386/pc_q35.c | 14 +++++++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 73 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index ba902b53ba..ff8a14439e 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2665,10 +2665,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_3_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 3) > + > static void virt_machine_5_2_options(MachineClass *mc) > { > + virt_machine_5_3_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > +DEFINE_VIRT_MACHINE(5, 2) > > static void virt_machine_5_1_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 7e2f4ec08e..6dc77699a9 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -28,6 +28,9 @@ > #include "hw/mem/nvdimm.h" > #include "migration/vmstate.h" > > +GlobalProperty hw_compat_5_2[] = { }; > +const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2); > + > GlobalProperty hw_compat_5_1[] = { > { "vhost-scsi", "num_queues", "1"}, > { "vhost-user-blk", "num-queues", "1"}, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index e87be5d29a..eaa046ff5d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_5_2[] = { }; > +const size_t pc_compat_5_2_len = G_N_ELEMENTS(pc_compat_5_2); > + > GlobalProperty pc_compat_5_1[] = { > { "ICH9-LPC", "x-smi-cpu-hotplug", "off" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 3c2ae0612b..01254090ce 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_5_2_machine_options(MachineClass *m) > +static void pc_i440fx_5_3_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,19 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_3, "pc-i440fx-5.3", NULL, > + pc_i440fx_5_3_machine_options); > + > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > +{ > + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > + pc_i440fx_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); > + compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); > +} > + > DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, > pc_i440fx_5_2_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3f4959c43..dd14803edb 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_5_2_machine_options(MachineClass *m) > +static void pc_q35_5_3_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -352,6 +352,18 @@ static void pc_q35_5_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_3, "pc-q35-5.3", NULL, > + pc_q35_5_3_machine_options); > + > +static void pc_q35_5_2_machine_options(MachineClass *m) > +{ > + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > + pc_q35_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); > + compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); > +} > + > DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, > pc_q35_5_2_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 2db810f73a..c292a3edd9 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4511,15 +4511,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.3 > + */ > +static void spapr_machine_5_3_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_3, "5.3", true); > + > /* > * pseries-5.2 > */ > static void spapr_machine_5_2_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_3_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); > } > > -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); > +DEFINE_SPAPR_MACHINE(5_2, "5.2", false); > > /* > * pseries-5.1 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 28266a3a35..bde084e13d 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -789,14 +789,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_5_3_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_3_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_3, "5.3", true); > + > static void ccw_machine_5_2_instance_options(MachineState *machine) > { > + ccw_machine_5_3_instance_options(machine); > } > > static void ccw_machine_5_2_class_options(MachineClass *mc) > { > + ccw_machine_5_3_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); > } > -DEFINE_CCW_MACHINE(5_2, "5.2", true); > +DEFINE_CCW_MACHINE(5_2, "5.2", false); > > static void ccw_machine_5_1_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index bf53e8a16e..f631c1799d 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -311,6 +311,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_5_2[]; > +extern const size_t hw_compat_5_2_len; > + > extern GlobalProperty hw_compat_5_1[]; > extern const size_t hw_compat_5_1_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 84639d0ebc..6f1531ed14 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -190,6 +190,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > > +extern GlobalProperty pc_compat_5_2[]; > +extern const size_t pc_compat_5_2_len; > + > extern GlobalProperty pc_compat_5_1[]; > extern const size_t pc_compat_5_1_len; > > -- > 2.23.0 > >
On 10/30/2020 1:08 AM, Andrew Jones wrote: > On Tue, Oct 20, 2020 at 09:14:32PM +0800, Ying Fang wrote: >> Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. > ^ 5.3 Thanks. Will fix, careless spelling mistake. > > Thanks, > drew > >> >> Signed-off-by: Ying Fang <fangying1@huawei.com> >> --- >> hw/arm/virt.c | 9 ++++++++- >> hw/core/machine.c | 3 +++ >> hw/i386/pc.c | 3 +++ >> hw/i386/pc_piix.c | 15 ++++++++++++++- >> hw/i386/pc_q35.c | 14 +++++++++++++- >> hw/ppc/spapr.c | 15 +++++++++++++-- >> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- >> include/hw/boards.h | 3 +++ >> include/hw/i386/pc.h | 3 +++ >> 9 files changed, 73 insertions(+), 6 deletions(-) >> >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index ba902b53ba..ff8a14439e 100644 >> --- a/hw/arm/virt.c >> +++ b/hw/arm/virt.c >> @@ -2665,10 +2665,17 @@ static void machvirt_machine_init(void) >> } >> type_init(machvirt_machine_init); >> >> +static void virt_machine_5_3_options(MachineClass *mc) >> +{ >> +} >> +DEFINE_VIRT_MACHINE_AS_LATEST(5, 3) >> + >> static void virt_machine_5_2_options(MachineClass *mc) >> { >> + virt_machine_5_3_options(mc); >> + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); >> } >> -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) >> +DEFINE_VIRT_MACHINE(5, 2) >> >> static void virt_machine_5_1_options(MachineClass *mc) >> { >> diff --git a/hw/core/machine.c b/hw/core/machine.c >> index 7e2f4ec08e..6dc77699a9 100644 >> --- a/hw/core/machine.c >> +++ b/hw/core/machine.c >> @@ -28,6 +28,9 @@ >> #include "hw/mem/nvdimm.h" >> #include "migration/vmstate.h" >> >> +GlobalProperty hw_compat_5_2[] = { }; >> +const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2); >> + >> GlobalProperty hw_compat_5_1[] = { >> { "vhost-scsi", "num_queues", "1"}, >> { "vhost-user-blk", "num-queues", "1"}, >> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >> index e87be5d29a..eaa046ff5d 100644 >> --- a/hw/i386/pc.c >> +++ b/hw/i386/pc.c >> @@ -97,6 +97,9 @@ >> #include "trace.h" >> #include CONFIG_DEVICES >> >> +GlobalProperty pc_compat_5_2[] = { }; >> +const size_t pc_compat_5_2_len = G_N_ELEMENTS(pc_compat_5_2); >> + >> GlobalProperty pc_compat_5_1[] = { >> { "ICH9-LPC", "x-smi-cpu-hotplug", "off" }, >> }; >> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c >> index 3c2ae0612b..01254090ce 100644 >> --- a/hw/i386/pc_piix.c >> +++ b/hw/i386/pc_piix.c >> @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) >> machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); >> } >> >> -static void pc_i440fx_5_2_machine_options(MachineClass *m) >> +static void pc_i440fx_5_3_machine_options(MachineClass *m) >> { >> PCMachineClass *pcmc = PC_MACHINE_CLASS(m); >> pc_i440fx_machine_options(m); >> @@ -435,6 +435,19 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) >> pcmc->default_cpu_version = 1; >> } >> >> +DEFINE_I440FX_MACHINE(v5_3, "pc-i440fx-5.3", NULL, >> + pc_i440fx_5_3_machine_options); >> + >> +static void pc_i440fx_5_2_machine_options(MachineClass *m) >> +{ >> + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); >> + pc_i440fx_machine_options(m); >> + m->alias = NULL; >> + m->is_default = false; >> + compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); >> + compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); >> +} >> + >> DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, >> pc_i440fx_5_2_machine_options); >> >> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c >> index a3f4959c43..dd14803edb 100644 >> --- a/hw/i386/pc_q35.c >> +++ b/hw/i386/pc_q35.c >> @@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) >> m->max_cpus = 288; >> } >> >> -static void pc_q35_5_2_machine_options(MachineClass *m) >> +static void pc_q35_5_3_machine_options(MachineClass *m) >> { >> PCMachineClass *pcmc = PC_MACHINE_CLASS(m); >> pc_q35_machine_options(m); >> @@ -352,6 +352,18 @@ static void pc_q35_5_2_machine_options(MachineClass *m) >> pcmc->default_cpu_version = 1; >> } >> >> +DEFINE_Q35_MACHINE(v5_3, "pc-q35-5.3", NULL, >> + pc_q35_5_3_machine_options); >> + >> +static void pc_q35_5_2_machine_options(MachineClass *m) >> +{ >> + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); >> + pc_q35_machine_options(m); >> + m->alias = NULL; >> + compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); >> + compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); >> +} >> + >> DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, >> pc_q35_5_2_machine_options); >> >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index 2db810f73a..c292a3edd9 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -4511,15 +4511,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) >> } \ >> type_init(spapr_machine_register_##suffix) >> >> +/* >> + * pseries-5.3 >> + */ >> +static void spapr_machine_5_3_class_options(MachineClass *mc) >> +{ >> + /* Defaults for the latest behaviour inherited from the base class */ >> +} >> + >> +DEFINE_SPAPR_MACHINE(5_3, "5.3", true); >> + >> /* >> * pseries-5.2 >> */ >> static void spapr_machine_5_2_class_options(MachineClass *mc) >> { >> - /* Defaults for the latest behaviour inherited from the base class */ >> + spapr_machine_5_3_class_options(mc); >> + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); >> } >> >> -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); >> +DEFINE_SPAPR_MACHINE(5_2, "5.2", false); >> >> /* >> * pseries-5.1 >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index 28266a3a35..bde084e13d 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -789,14 +789,26 @@ bool css_migration_enabled(void) >> } \ >> type_init(ccw_machine_register_##suffix) >> >> +static void ccw_machine_5_3_instance_options(MachineState *machine) >> +{ >> +} >> + >> +static void ccw_machine_5_3_class_options(MachineClass *mc) >> +{ >> +} >> +DEFINE_CCW_MACHINE(5_3, "5.3", true); >> + >> static void ccw_machine_5_2_instance_options(MachineState *machine) >> { >> + ccw_machine_5_3_instance_options(machine); >> } >> >> static void ccw_machine_5_2_class_options(MachineClass *mc) >> { >> + ccw_machine_5_3_class_options(mc); >> + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); >> } >> -DEFINE_CCW_MACHINE(5_2, "5.2", true); >> +DEFINE_CCW_MACHINE(5_2, "5.2", false); >> >> static void ccw_machine_5_1_instance_options(MachineState *machine) >> { >> diff --git a/include/hw/boards.h b/include/hw/boards.h >> index bf53e8a16e..f631c1799d 100644 >> --- a/include/hw/boards.h >> +++ b/include/hw/boards.h >> @@ -311,6 +311,9 @@ struct MachineState { >> } \ >> type_init(machine_initfn##_register_types) >> >> +extern GlobalProperty hw_compat_5_2[]; >> +extern const size_t hw_compat_5_2_len; >> + >> extern GlobalProperty hw_compat_5_1[]; >> extern const size_t hw_compat_5_1_len; >> >> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h >> index 84639d0ebc..6f1531ed14 100644 >> --- a/include/hw/i386/pc.h >> +++ b/include/hw/i386/pc.h >> @@ -190,6 +190,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); >> void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, >> const CPUArchIdList *apic_ids, GArray *entry); >> >> +extern GlobalProperty pc_compat_5_2[]; >> +extern const size_t pc_compat_5_2_len; >> + >> extern GlobalProperty pc_compat_5_1[]; >> extern const size_t pc_compat_5_1_len; >> >> -- >> 2.23.0 >> >> > > . >
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ba902b53ba..ff8a14439e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2665,10 +2665,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_5_3_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 3) + static void virt_machine_5_2_options(MachineClass *mc) { + virt_machine_5_3_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +DEFINE_VIRT_MACHINE(5, 2) static void virt_machine_5_1_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 7e2f4ec08e..6dc77699a9 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -28,6 +28,9 @@ #include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_2[] = { }; +const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2); + GlobalProperty hw_compat_5_1[] = { { "vhost-scsi", "num_queues", "1"}, { "vhost-user-blk", "num-queues", "1"}, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e87be5d29a..eaa046ff5d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -97,6 +97,9 @@ #include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_5_2[] = { }; +const size_t pc_compat_5_2_len = G_N_ELEMENTS(pc_compat_5_2); + GlobalProperty pc_compat_5_1[] = { { "ICH9-LPC", "x-smi-cpu-hotplug", "off" }, }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3c2ae0612b..01254090ce 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_i440fx_5_2_machine_options(MachineClass *m) +static void pc_i440fx_5_3_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -435,6 +435,19 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v5_3, "pc-i440fx-5.3", NULL, + pc_i440fx_5_3_machine_options); + +static void pc_i440fx_5_2_machine_options(MachineClass *m) +{ + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pc_i440fx_machine_options(m); + m->alias = NULL; + m->is_default = false; + compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); + compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} + DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, pc_i440fx_5_2_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a3f4959c43..dd14803edb 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_5_2_machine_options(MachineClass *m) +static void pc_q35_5_3_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -352,6 +352,18 @@ static void pc_q35_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v5_3, "pc-q35-5.3", NULL, + pc_q35_5_3_machine_options); + +static void pc_q35_5_2_machine_options(MachineClass *m) +{ + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pc_q35_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); + compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} + DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, pc_q35_5_2_machine_options); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2db810f73a..c292a3edd9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4511,15 +4511,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-5.3 + */ +static void spapr_machine_5_3_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_3, "5.3", true); + /* * pseries-5.2 */ static void spapr_machine_5_2_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_5_3_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +DEFINE_SPAPR_MACHINE(5_2, "5.2", false); /* * pseries-5.1 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 28266a3a35..bde084e13d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -789,14 +789,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_3_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_3_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_3, "5.3", true); + static void ccw_machine_5_2_instance_options(MachineState *machine) { + ccw_machine_5_3_instance_options(machine); } static void ccw_machine_5_2_class_options(MachineClass *mc) { + ccw_machine_5_3_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_CCW_MACHINE(5_2, "5.2", true); +DEFINE_CCW_MACHINE(5_2, "5.2", false); static void ccw_machine_5_1_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index bf53e8a16e..f631c1799d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -311,6 +311,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_2[]; +extern const size_t hw_compat_5_2_len; + extern GlobalProperty hw_compat_5_1[]; extern const size_t hw_compat_5_1_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 84639d0ebc..6f1531ed14 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -190,6 +190,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, const CPUArchIdList *apic_ids, GArray *entry); +extern GlobalProperty pc_compat_5_2[]; +extern const size_t pc_compat_5_2_len; + extern GlobalProperty pc_compat_5_1[]; extern const size_t pc_compat_5_1_len;
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Ying Fang <fangying1@huawei.com> --- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 15 ++++++++++++++- hw/i386/pc_q35.c | 14 +++++++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 9 files changed, 73 insertions(+), 6 deletions(-)