compat machines for 8.0
v2 cover compat machines for 8.0
In addition to adding the compat machines for 8.0, let's clean up the pc ones as well, as suggested by Thomas.
v1->v2:
- add missing blank in patch 1
- add r-bs for patch 1
- add patch 2
Cornelia Huck (2):
hw: Add compat machines for 8.0
pc: clean up compat machines
hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 41 +++++++++++++------------------------- hw/i386/pc_q35.c | 29 ++++++++++++--------------- hw/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 ++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 ++++++++++++- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 10 files changed, 81 insertions(+), 48 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/2 hw: Add compat machines for 8.0
Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
--- 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/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 10 files changed, 79 insertions(+), 7 deletions(-)
hw/arm/virt.c +8 -1
@@ -3096,10 +3096,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_8_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(8, 0) +static void virt_machine_7_2_options (MachineClass *mc) { +virt_machine_8_0_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_2, hw_compat_7_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(7, 2) +DEFINE_VIRT_MACHINE(7, 2)static void virt_machine_7_1_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -40,6 +40,9 @@#include "hw/virtio/virtio-pci.h" #include "qom/object_interfaces.h" +GlobalProperty hw_compat_7_2[] = {}; +const size_t hw_compat_7_2_len =G_N_ELEMENTS (hw_compat_7_2); +GlobalProperty hw_compat_7_1[] = { {"virtio-device" ,"queue_reset" ,"false" }, };
hw/i386/pc.c +3 -0
@@ -107,6 +107,9 @@ { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, +GlobalProperty pc_compat_7_2[] = {}; +const size_t pc_compat_7_2_len =G_N_ELEMENTS (pc_compat_7_2); +GlobalProperty pc_compat_7_1[] = {};const size_t pc_compat_7_1_len =G_N_ELEMENTS (pc_compat_7_1);
hw/i386/pc_piix.c +13 -1
@@ -435,7 +435,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_7_2_machine_options (MachineClass *m) +static void pc_i440fx_8_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);
@@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v8_0,"pc-i440fx-8.0" ,NULL , + pc_i440fx_8_0_machine_options); + +static void pc_i440fx_7_2_machine_options (MachineClass *m) +{ +pc_i440fx_8_0_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_7_2, hw_compat_7_2_len); +compat_props_add (m->compat_props, pc_compat_7_2, pc_compat_7_2_len); +} +DEFINE_I440FX_MACHINE (v7_2,"pc-i440fx-7.2" ,NULL , pc_i440fx_7_2_machine_options);
hw/i386/pc_q35.c +12 -1
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_7_2_machine_options (MachineClass *m) +static void pc_q35_8_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);
@@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v8_0,"pc-q35-8.0" ,NULL , + pc_q35_8_0_machine_options); + +static void pc_q35_7_2_machine_options (MachineClass *m) +{ +pc_q35_8_0_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_7_2, hw_compat_7_2_len); +compat_props_add (m->compat_props, pc_compat_7_2, pc_compat_7_2_len); +} +DEFINE_Q35_MACHINE (v7_2,"pc-q35-7.2" ,NULL , pc_q35_7_2_machine_options);
hw/m68k/virt.c +8 -1
@@ -346,10 +346,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_8_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(8, 0, true) +static void virt_machine_7_2_options (MachineClass *mc) { +virt_machine_8_0_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_2, hw_compat_7_2_len); } -DEFINE_VIRT_MACHINE(7, 2, true) +DEFINE_VIRT_MACHINE(7, 2, false)static void virt_machine_7_1_options (MachineClass *mc) {
hw/ppc/spapr.c +13 -2
@@ -4733,15 +4733,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-8.0 +*/ +static void spapr_machine_8_0_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(8_0, "8.0", true); +/* * pseries-7.2 */ static void spapr_machine_7_2_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_8_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_2, hw_compat_7_2_len); } -DEFINE_SPAPR_MACHINE(7_2, "7.2", true); +DEFINE_SPAPR_MACHINE(7_2, "7.2", false);/* * pseries-7.1
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -823,14 +823,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_8_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_8_0_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(8_0, "8.0", true); +static void ccw_machine_7_2_instance_options (MachineState *machine) { +ccw_machine_8_0_instance_options (machine); }static void ccw_machine_7_2_class_options (MachineClass *mc) { +ccw_machine_8_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_2, hw_compat_7_2_len); } -DEFINE_CCW_MACHINE(7_2, "7.2", true); +DEFINE_CCW_MACHINE(7_2, "7.2", false);static void ccw_machine_7_1_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -379,6 +379,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_7_2[]; +extern const size_t hw_compat_7_2_len; +extern GlobalProperty hw_compat_7_1[];extern const size_t hw_compat_7_1_len;
include/hw/i386/pc.h +3 -0
@@ -200,6 +200,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,/* sgx.c */ void pc_machine_init_sgx_epc (PCMachineState *pcms); +extern GlobalProperty pc_compat_7_2[]; +extern const size_t pc_compat_7_2_len; +extern GlobalProperty pc_compat_7_1[];extern const size_t pc_compat_7_1_len;
Signature · 1 line
2.38.1
PATCH v2 2/2 pc: clean up compat machines
In reply to Cornelia HuckWe can move setting default_cpu_version into the base machine options, and we need to unset alias and is_default only once.
--- hw/i386/pc_piix.c | 27 +-------------------------- hw/i386/pc_q35.c | 16 +--------------- 2 files changed, 2 insertions(+), 41 deletions(-)
hw/i386/pc_piix.c +1 -26
@@ -426,6 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m); pcmc->default_nic_model ="e1000" ; pcmc->pci_root_uid =0 ; + pcmc->default_cpu_version =1 ; m->family ="pc_piix" ; m->desc ="Standard PC (i440FX + PIIX, 1996)" ;
@@ -437,11 +438,9 @@ static void pc_i440fx_machine_options(MachineClass *m)static void pc_i440fx_8_0_machine_options (MachineClass *m) { -PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; - pcmc->default_cpu_version =1 ; } DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
@@ -463,8 +462,6 @@ static void pc_i440fx_7_1_machine_options(MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_7_2_machine_options (m); - m->alias =NULL ; - m->is_default = false; pcmc->legacy_no_rng_seed = true;compat_props_add (m->compat_props, hw_compat_7_1, hw_compat_7_1_len);compat_props_add (m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
@@ -477,8 +474,6 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_7_1_machine_options (m); - m->alias =NULL ; - m->is_default = false; pcmc->enforce_amd_1tb_hole = false;compat_props_add (m->compat_props, hw_compat_7_0, hw_compat_7_0_len);compat_props_add (m->compat_props, pc_compat_7_0, pc_compat_7_0_len);
@@ -490,8 +485,6 @@ DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL,static void pc_i440fx_6_2_machine_options (MachineClass *m) {pc_i440fx_7_0_machine_options (m); - m->alias =NULL ; - m->is_default = false;compat_props_add (m->compat_props, hw_compat_6_2, hw_compat_6_2_len);compat_props_add (m->compat_props, pc_compat_6_2, pc_compat_6_2_len); }
@@ -502,8 +495,6 @@ DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL,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); m->smp_props.prefer_sockets = true;
@@ -515,8 +506,6 @@ DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL,static void pc_i440fx_6_0_machine_options (MachineClass *m) {pc_i440fx_6_1_machine_options (m); - m->alias =NULL ; - m->is_default = false;compat_props_add (m->compat_props, hw_compat_6_0, hw_compat_6_0_len);compat_props_add (m->compat_props, pc_compat_6_0, pc_compat_6_0_len); }
@@ -527,8 +516,6 @@ DEFINE_I440FX_MACHINE(v6_0, "pc-i440fx-6.0", NULL,static void pc_i440fx_5_2_machine_options (MachineClass *m) {pc_i440fx_6_0_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); }
@@ -541,8 +528,6 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_5_2_machine_options (m); - m->alias =NULL ; - m->is_default = false;compat_props_add (m->compat_props, hw_compat_5_1, hw_compat_5_1_len);compat_props_add (m->compat_props, pc_compat_5_1, pc_compat_5_1_len); pcmc->kvmclock_create_always = false;
@@ -555,8 +540,6 @@ DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL,static void pc_i440fx_5_0_machine_options (MachineClass *m) {pc_i440fx_5_1_machine_options (m); - m->alias =NULL ; - m->is_default = false; m->numa_mem_supported = true;compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len);
@@ -569,8 +552,6 @@ DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,static void pc_i440fx_4_2_machine_options (MachineClass *m) {pc_i440fx_5_0_machine_options (m); - m->alias =NULL ; - m->is_default = false;compat_props_add (m->compat_props, hw_compat_4_2, hw_compat_4_2_len);compat_props_add (m->compat_props, pc_compat_4_2, pc_compat_4_2_len); }
@@ -581,8 +562,6 @@ DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL,static void pc_i440fx_4_1_machine_options (MachineClass *m) {pc_i440fx_4_2_machine_options (m); - m->alias =NULL ; - m->is_default = false;compat_props_add (m->compat_props, hw_compat_4_1, hw_compat_4_1_len);compat_props_add (m->compat_props, pc_compat_4_1, pc_compat_4_1_len); }
@@ -594,8 +573,6 @@ static void pc_i440fx_4_0_machine_options(MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_4_1_machine_options (m); - m->alias =NULL ; - m->is_default = false; pcmc->default_cpu_version =CPU_VERSION_LEGACY ;compat_props_add (m->compat_props, hw_compat_4_0, hw_compat_4_0_len);compat_props_add (m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
@@ -609,9 +586,7 @@ static void pc_i440fx_3_1_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_4_0_machine_options (m); - m->is_default = false; m->smbus_no_migration_support = true; - m->alias =NULL ; pcmc->pvh_enabled = false;compat_props_add (m->compat_props, hw_compat_3_1, hw_compat_3_1_len);compat_props_add (m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
hw/i386/pc_q35.c +1 -15
@@ -355,6 +355,7 @@ static void pc_q35_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m); pcmc->default_nic_model ="e1000e" ; pcmc->pci_root_uid =0 ; + pcmc->default_cpu_version =1 ; m->family ="pc_q35" ; m->desc ="Standard PC (Q35 + ICH9, 2009)" ;
@@ -372,10 +373,8 @@ static void pc_q35_machine_options(MachineClass *m)static void pc_q35_8_0_machine_options (MachineClass *m) { -PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m); m->alias ="q35" ; - pcmc->default_cpu_version =1 ; } DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
@@ -396,7 +395,6 @@ static void pc_q35_7_1_machine_options(MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_7_2_machine_options (m); - m->alias =NULL ; pcmc->legacy_no_rng_seed = true;compat_props_add (m->compat_props, hw_compat_7_1, hw_compat_7_1_len);compat_props_add (m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
@@ -409,7 +407,6 @@ static void pc_q35_7_0_machine_options(MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_7_1_machine_options (m); - m->alias =NULL ; pcmc->enforce_amd_1tb_hole = false;compat_props_add (m->compat_props, hw_compat_7_0, hw_compat_7_0_len);compat_props_add (m->compat_props, pc_compat_7_0, pc_compat_7_0_len);
@@ -421,7 +418,6 @@ DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL,static void pc_q35_6_2_machine_options (MachineClass *m) {pc_q35_7_0_machine_options (m); - m->alias =NULL ;compat_props_add (m->compat_props, hw_compat_6_2, hw_compat_6_2_len);compat_props_add (m->compat_props, pc_compat_6_2, pc_compat_6_2_len); }
@@ -432,7 +428,6 @@ DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL,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); m->smp_props.prefer_sockets = true;
@@ -444,7 +439,6 @@ DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL,static void pc_q35_6_0_machine_options (MachineClass *m) {pc_q35_6_1_machine_options (m); - m->alias =NULL ;compat_props_add (m->compat_props, hw_compat_6_0, hw_compat_6_0_len);compat_props_add (m->compat_props, pc_compat_6_0, pc_compat_6_0_len); }
@@ -455,7 +449,6 @@ DEFINE_Q35_MACHINE(v6_0, "pc-q35-6.0", NULL,static void pc_q35_5_2_machine_options (MachineClass *m) {pc_q35_6_0_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); }
@@ -468,7 +461,6 @@ static void pc_q35_5_1_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_5_2_machine_options (m); - m->alias =NULL ;compat_props_add (m->compat_props, hw_compat_5_1, hw_compat_5_1_len);compat_props_add (m->compat_props, pc_compat_5_1, pc_compat_5_1_len); pcmc->kvmclock_create_always = false;
@@ -481,7 +473,6 @@ DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL,static void pc_q35_5_0_machine_options (MachineClass *m) {pc_q35_5_1_machine_options (m); - m->alias =NULL ; m->numa_mem_supported = true;compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len);
@@ -494,7 +485,6 @@ DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,static void pc_q35_4_2_machine_options (MachineClass *m) {pc_q35_5_0_machine_options (m); - m->alias =NULL ;compat_props_add (m->compat_props, hw_compat_4_2, hw_compat_4_2_len);compat_props_add (m->compat_props, pc_compat_4_2, pc_compat_4_2_len); }
@@ -505,7 +495,6 @@ DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL,static void pc_q35_4_1_machine_options (MachineClass *m) {pc_q35_4_2_machine_options (m); - m->alias =NULL ;compat_props_add (m->compat_props, hw_compat_4_1, hw_compat_4_1_len);compat_props_add (m->compat_props, pc_compat_4_1, pc_compat_4_1_len); }
@@ -517,7 +506,6 @@ static void pc_q35_4_0_1_machine_options(MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_4_1_machine_options (m); - m->alias =NULL ; pcmc->default_cpu_version =CPU_VERSION_LEGACY ;/* * This is the default machine for the 4.0-stable branch. It is basically
@@ -535,7 +523,6 @@ static void pc_q35_4_0_machine_options(MachineClass *m) {pc_q35_4_0_1_machine_options (m); m->default_kernel_irqchip_split = true; - m->alias =NULL ;/* Compat props are applied by the 4.0.1 machine */ }
@@ -549,7 +536,6 @@ static void pc_q35_3_1_machine_options(MachineClass *m)pc_q35_4_0_machine_options (m); m->default_kernel_irqchip_split = false; m->smbus_no_migration_support = true; - m->alias =NULL ; pcmc->pvh_enabled = false;compat_props_add (m->compat_props, hw_compat_3_1, hw_compat_3_1_len);compat_props_add (m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
Signature · 1 line
2.38.1
Re: [PATCH for-8.0 v2 2/2] pc: clean up compat machines
Quoted 9 lines · Cornelia Huck
We can move setting
default_cpu_versioninto the base machine options, and we need to unset alias andis_defaultonly once.Suggested-by Thomas Huth <[email protected]>Signed-off-by Cornelia Huck <[email protected]>--- hw/i386/pc_piix.c | 27 +-------------------------- hw/i386/pc_q35.c | 16 +--------------- 2 files changed, 2 insertions(+), 41 deletions(-)
Maybe best if both patches go through an x86 tree this time, I guess?