| Message ID | 20210719032043.25416-7-wangyanan55@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | machine: smp parsing fixes and improvement | expand |
On Mon, Jul 19, 2021 at 11:20:38AM +0800, Yanan Wang wrote: > Add 6.2 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > 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, 71 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 81eda46b0b..01165f7f53 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2788,10 +2788,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_6_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) > + > static void virt_machine_6_1_options(MachineClass *mc) > { > + virt_machine_6_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) > +DEFINE_VIRT_MACHINE(6, 1) > > static void virt_machine_6_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 8b4d07d3fc..63439c4a6d 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,6 +37,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_6_1[] = {}; > +const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1); > + > GlobalProperty hw_compat_6_0[] = { > { "gpex-pcihost", "allow-unmapped-accesses", "false" }, > { "i8042", "extended-state", "false"}, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index d94ef582b5..c6768c6ce7 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -94,6 +94,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_6_1[] = {}; > +const size_t pc_compat_6_1_len = G_N_ELEMENTS(pc_compat_6_1); > + > GlobalProperty pc_compat_6_0[] = { > { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, > { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 30b8bd6ea9..fd5c2277f2 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_6_1_machine_options(MachineClass *m) > +static void pc_i440fx_6_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -422,6 +422,18 @@ static void pc_i440fx_6_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, > + pc_i440fx_6_2_machine_options); > + > +static void pc_i440fx_6_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_6_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len); > + compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len); > +} > + > DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL, > pc_i440fx_6_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 04b4a4788d..b45903b15e 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -355,7 +355,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_6_1_machine_options(MachineClass *m) > +static void pc_q35_6_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -363,6 +363,17 @@ static void pc_q35_6_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, > + pc_q35_6_2_machine_options); > + > +static void pc_q35_6_1_machine_options(MachineClass *m) > +{ > + pc_q35_6_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len); > + compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len); > +} > + > DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL, > pc_q35_6_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 81699d4f8b..d39fd4e644 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4685,15 +4685,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-6.2 > + */ > +static void spapr_machine_6_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(6_2, "6.2", true); > + > /* > * pseries-6.1 > */ > static void spapr_machine_6_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_6_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > > -DEFINE_SPAPR_MACHINE(6_1, "6.1", true); > +DEFINE_SPAPR_MACHINE(6_1, "6.1", false); > > /* > * pseries-6.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index e4b18aef49..4d25278cf2 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -791,14 +791,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_6_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_6_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(6_2, "6.2", true); > + > static void ccw_machine_6_1_instance_options(MachineState *machine) > { > + ccw_machine_6_2_instance_options(machine); > } > > static void ccw_machine_6_1_class_options(MachineClass *mc) > { > + ccw_machine_6_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > -DEFINE_CCW_MACHINE(6_1, "6.1", true); > +DEFINE_CCW_MACHINE(6_1, "6.1", false); > > static void ccw_machine_6_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index b6161cee88..2832f0f8aa 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -354,6 +354,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_6_1[]; > +extern const size_t hw_compat_6_1_len; > + > extern GlobalProperty hw_compat_6_0[]; > extern const size_t hw_compat_6_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 88dffe7517..97b4ab79b5 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -196,6 +196,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > > +extern GlobalProperty pc_compat_6_1[]; > +extern const size_t pc_compat_6_1_len; > + > extern GlobalProperty pc_compat_6_0[]; > extern const size_t pc_compat_6_0_len; >
On Mon, Jul 19, 2021 at 11:20:38AM +0800, Yanan Wang wrote: > Add 6.2 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > 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, 71 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 81eda46b0b..01165f7f53 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2788,10 +2788,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_6_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) > + > static void virt_machine_6_1_options(MachineClass *mc) > { > + virt_machine_6_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) > +DEFINE_VIRT_MACHINE(6, 1) > > static void virt_machine_6_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 8b4d07d3fc..63439c4a6d 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,6 +37,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_6_1[] = {}; > +const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1); > + > GlobalProperty hw_compat_6_0[] = { > { "gpex-pcihost", "allow-unmapped-accesses", "false" }, > { "i8042", "extended-state", "false"}, > diff --git a/include/hw/boards.h b/include/hw/boards.h > index b6161cee88..2832f0f8aa 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -354,6 +354,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_6_1[]; > +extern const size_t hw_compat_6_1_len; > + > extern GlobalProperty hw_compat_6_0[]; > extern const size_t hw_compat_6_0_len; > Arm and general parts look good to me Reviewed-by: Andrew Jones <drjones@redhat.com>
On Mon, Jul 19 2021, Yanan Wang <wangyanan55@huawei.com> wrote: > Add 6.2 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > 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, 71 insertions(+), 6 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> Add 6.2 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Yanan Wang <wangyanan55@huawei.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > 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, 71 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 81eda46b0b..01165f7f53 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2788,10 +2788,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_6_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) > + > static void virt_machine_6_1_options(MachineClass *mc) > { > + virt_machine_6_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) > +DEFINE_VIRT_MACHINE(6, 1) > > static void virt_machine_6_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 8b4d07d3fc..63439c4a6d 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,6 +37,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_6_1[] = {}; > +const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1); > + > GlobalProperty hw_compat_6_0[] = { > { "gpex-pcihost", "allow-unmapped-accesses", "false" }, > { "i8042", "extended-state", "false"}, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index d94ef582b5..c6768c6ce7 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -94,6 +94,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_6_1[] = {}; > +const size_t pc_compat_6_1_len = G_N_ELEMENTS(pc_compat_6_1); > + > GlobalProperty pc_compat_6_0[] = { > { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, > { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 30b8bd6ea9..fd5c2277f2 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_6_1_machine_options(MachineClass *m) > +static void pc_i440fx_6_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -422,6 +422,18 @@ static void pc_i440fx_6_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, > + pc_i440fx_6_2_machine_options); > + > +static void pc_i440fx_6_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_6_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len); > + compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len); > +} > + > DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL, > pc_i440fx_6_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 04b4a4788d..b45903b15e 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -355,7 +355,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_6_1_machine_options(MachineClass *m) > +static void pc_q35_6_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -363,6 +363,17 @@ static void pc_q35_6_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, > + pc_q35_6_2_machine_options); > + > +static void pc_q35_6_1_machine_options(MachineClass *m) > +{ > + pc_q35_6_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len); > + compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len); > +} > + > DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL, > pc_q35_6_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 81699d4f8b..d39fd4e644 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4685,15 +4685,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-6.2 > + */ > +static void spapr_machine_6_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(6_2, "6.2", true); > + > /* > * pseries-6.1 > */ > static void spapr_machine_6_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_6_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > > -DEFINE_SPAPR_MACHINE(6_1, "6.1", true); > +DEFINE_SPAPR_MACHINE(6_1, "6.1", false); > > /* > * pseries-6.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index e4b18aef49..4d25278cf2 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -791,14 +791,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_6_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_6_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(6_2, "6.2", true); > + > static void ccw_machine_6_1_instance_options(MachineState *machine) > { > + ccw_machine_6_2_instance_options(machine); > } > > static void ccw_machine_6_1_class_options(MachineClass *mc) > { > + ccw_machine_6_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); > } > -DEFINE_CCW_MACHINE(6_1, "6.1", true); > +DEFINE_CCW_MACHINE(6_1, "6.1", false); > > static void ccw_machine_6_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index b6161cee88..2832f0f8aa 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -354,6 +354,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_6_1[]; > +extern const size_t hw_compat_6_1_len; > + > extern GlobalProperty hw_compat_6_0[]; > extern const size_t hw_compat_6_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 88dffe7517..97b4ab79b5 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -196,6 +196,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > > +extern GlobalProperty pc_compat_6_1[]; > +extern const size_t pc_compat_6_1_len; > + > extern GlobalProperty pc_compat_6_0[]; > extern const size_t pc_compat_6_0_len; > > -- Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 81eda46b0b..01165f7f53 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2788,10 +2788,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_6_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) + static void virt_machine_6_1_options(MachineClass *mc) { + virt_machine_6_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) +DEFINE_VIRT_MACHINE(6, 1) static void virt_machine_6_0_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 8b4d07d3fc..63439c4a6d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -37,6 +37,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_6_1[] = {}; +const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1); + GlobalProperty hw_compat_6_0[] = { { "gpex-pcihost", "allow-unmapped-accesses", "false" }, { "i8042", "extended-state", "false"}, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d94ef582b5..c6768c6ce7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -94,6 +94,9 @@ #include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_6_1[] = {}; +const size_t pc_compat_6_1_len = G_N_ELEMENTS(pc_compat_6_1); + GlobalProperty pc_compat_6_0[] = { { "qemu64" "-" TYPE_X86_CPU, "family", "6" }, { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 30b8bd6ea9..fd5c2277f2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_i440fx_6_1_machine_options(MachineClass *m) +static void pc_i440fx_6_2_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -422,6 +422,18 @@ static void pc_i440fx_6_1_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, + pc_i440fx_6_2_machine_options); + +static void pc_i440fx_6_1_machine_options(MachineClass *m) +{ + pc_i440fx_6_2_machine_options(m); + m->alias = NULL; + m->is_default = false; + compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len); + compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len); +} + DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL, pc_i440fx_6_1_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 04b4a4788d..b45903b15e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -355,7 +355,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_6_1_machine_options(MachineClass *m) +static void pc_q35_6_2_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -363,6 +363,17 @@ static void pc_q35_6_1_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, + pc_q35_6_2_machine_options); + +static void pc_q35_6_1_machine_options(MachineClass *m) +{ + pc_q35_6_2_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len); + compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len); +} + DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL, pc_q35_6_1_machine_options); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 81699d4f8b..d39fd4e644 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4685,15 +4685,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-6.2 + */ +static void spapr_machine_6_2_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(6_2, "6.2", true); + /* * pseries-6.1 */ static void spapr_machine_6_1_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_6_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); } -DEFINE_SPAPR_MACHINE(6_1, "6.1", true); +DEFINE_SPAPR_MACHINE(6_1, "6.1", false); /* * pseries-6.0 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e4b18aef49..4d25278cf2 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -791,14 +791,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_6_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_6_2_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(6_2, "6.2", true); + static void ccw_machine_6_1_instance_options(MachineState *machine) { + ccw_machine_6_2_instance_options(machine); } static void ccw_machine_6_1_class_options(MachineClass *mc) { + ccw_machine_6_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); } -DEFINE_CCW_MACHINE(6_1, "6.1", true); +DEFINE_CCW_MACHINE(6_1, "6.1", false); static void ccw_machine_6_0_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index b6161cee88..2832f0f8aa 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -354,6 +354,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_6_1[]; +extern const size_t hw_compat_6_1_len; + extern GlobalProperty hw_compat_6_0[]; extern const size_t hw_compat_6_0_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 88dffe7517..97b4ab79b5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -196,6 +196,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, const CPUArchIdList *apic_ids, GArray *entry); +extern GlobalProperty pc_compat_6_1[]; +extern const size_t pc_compat_6_1_len; + extern GlobalProperty pc_compat_6_0[]; extern const size_t pc_compat_6_0_len;
Add 6.2 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Yanan Wang <wangyanan55@huawei.com> --- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 14 +++++++++++++- hw/i386/pc_q35.c | 13 ++++++++++++- 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, 71 insertions(+), 6 deletions(-)