hw: Add compat machines for 7.1
PATCH 1/1 hw: Add compat machines for 7.1
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
--- 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
@@ -3017,10 +3017,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(7, 1) +static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) +DEFINE_VIRT_MACHINE(7, 0)static void virt_machine_6_2_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -37,6 +37,9 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_7_0[] = {}; +const size_t hw_compat_7_0_len =G_N_ELEMENTS (hw_compat_7_0); +GlobalProperty hw_compat_6_2[] = {};const size_t hw_compat_6_2_len =G_N_ELEMENTS (hw_compat_6_2);
hw/i386/pc.c +3 -0
@@ -95,6 +95,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_7_0[] = {}; +const size_t pc_compat_7_0_len =G_N_ELEMENTS (pc_compat_7_0); +GlobalProperty pc_compat_6_2[] = { {"virtio-mem" ,"unplugged-inaccessible" ,"off" }, };
hw/i386/pc_piix.c +13 -1
@@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_7_0_machine_options (MachineClass *m) +static void pc_i440fx_7_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);
@@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v7_1,"pc-i440fx-7.1" ,NULL , + pc_i440fx_7_1_machine_options); + +static void pc_i440fx_7_0_machine_options (MachineClass *m) +{ +pc_i440fx_7_1_machine_options (m); + m->alias =NULL ; + m->is_default = 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); +} +DEFINE_I440FX_MACHINE (v7_0,"pc-i440fx-7.0" ,NULL , pc_i440fx_7_0_machine_options);
hw/i386/pc_q35.c +12 -1
@@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_7_0_machine_options (MachineClass *m) +static void pc_q35_7_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);
@@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v7_1,"pc-q35-7.1" ,NULL , + pc_q35_7_1_machine_options); + +static void pc_q35_7_0_machine_options (MachineClass *m) +{ +pc_q35_7_1_machine_options (m); + m->alias =NULL ; +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); +} +DEFINE_Q35_MACHINE (v7_0,"pc-q35-7.0" ,NULL , pc_q35_7_0_machine_options);
hw/m68k/virt.c +8 -1
@@ -316,10 +316,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(7, 1, true) +static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE(7, 0, true) +DEFINE_VIRT_MACHINE(7, 0, false)static void virt_machine_6_2_options (MachineClass *mc) {
hw/ppc/spapr.c +13 -2
@@ -4703,15 +4703,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-7.1 +*/ +static void spapr_machine_7_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(7_1, "7.1", true); +/* * pseries-7.0 */ static void spapr_machine_7_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_SPAPR_MACHINE(7_0, "7.0", true); +DEFINE_SPAPR_MACHINE(7_0, "7.0", false);/* * pseries-6.2
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -791,14 +791,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_7_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_7_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(7_1, "7.1", true); +static void ccw_machine_7_0_instance_options (MachineState *machine) { +ccw_machine_7_1_instance_options (machine); }static void ccw_machine_7_0_class_options (MachineClass *mc) { +ccw_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_CCW_MACHINE(7_0, "7.0", true); +DEFINE_CCW_MACHINE(7_0, "7.0", false);static void ccw_machine_6_2_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -380,6 +380,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_7_0[]; +extern const size_t hw_compat_7_0_len; +extern GlobalProperty hw_compat_6_2[];extern const size_t hw_compat_6_2_len;
include/hw/i386/pc.h +3 -0
@@ -202,6 +202,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_0[]; +extern const size_t pc_compat_7_0_len; +extern GlobalProperty pc_compat_6_2[];extern const size_t pc_compat_6_2_len;
Signature · 1 line
2.34.1
Quoted 15 lines · Cornelia Huck
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>--- 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(-)
For the PPC part:
Reviewed-by Cédric Le Goater <[email protected]>
Thanks,
C.
Quoted 15 lines · Cornelia Huck
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>--- 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(-)
Reviewed-by Yanan Wang <[email protected]>
Thanks,
Yanan
Quoted 230 lines
hw/arm/virt.c +8
-1@@ -3017,10 +3017,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(7, 1) +static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) +DEFINE_VIRT_MACHINE(7, 0)static void virt_machine_6_2_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -37,6 +37,9 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_7_0[] = {}; +const size_t hw_compat_7_0_len =G_N_ELEMENTS (hw_compat_7_0); +GlobalProperty hw_compat_6_2[] = {};const size_t hw_compat_6_2_len =G_N_ELEMENTS (hw_compat_6_2);hw/i386/pc.c +3
-0@@ -95,6 +95,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_7_0[] = {}; +const size_t pc_compat_7_0_len =G_N_ELEMENTS (pc_compat_7_0); +GlobalProperty pc_compat_6_2[] = { {"virtio-mem" ,"unplugged-inaccessible" ,"off" }, };hw/i386/pc_piix.c +13
-1@@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_7_0_machine_options (MachineClass *m) +static void pc_i440fx_7_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v7_1,"pc-i440fx-7.1" ,NULL , + pc_i440fx_7_1_machine_options); + +static void pc_i440fx_7_0_machine_options (MachineClass *m) +{ +pc_i440fx_7_1_machine_options (m); + m->alias =NULL ; + m->is_default = 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); +} +DEFINE_I440FX_MACHINE (v7_0,"pc-i440fx-7.0" ,NULL , pc_i440fx_7_0_machine_options);hw/i386/pc_q35.c +12
-1@@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_7_0_machine_options (MachineClass *m) +static void pc_q35_7_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v7_1,"pc-q35-7.1" ,NULL , + pc_q35_7_1_machine_options); + +static void pc_q35_7_0_machine_options (MachineClass *m) +{ +pc_q35_7_1_machine_options (m); + m->alias =NULL ; +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); +} +DEFINE_Q35_MACHINE (v7_0,"pc-q35-7.0" ,NULL , pc_q35_7_0_machine_options);hw/m68k/virt.c +8
-1@@ -316,10 +316,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(7, 1, true) +static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE(7, 0, true) +DEFINE_VIRT_MACHINE(7, 0, false)static void virt_machine_6_2_options (MachineClass *mc) {hw/ppc/spapr.c +13
-2@@ -4703,15 +4703,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-7.1 +*/ +static void spapr_machine_7_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(7_1, "7.1", true); +/* * pseries-7.0 */ static void spapr_machine_7_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_SPAPR_MACHINE(7_0, "7.0", true); +DEFINE_SPAPR_MACHINE(7_0, "7.0", false);/* * pseries-6.2 hw/s390x/s390-virtio-ccw.c +13
-1@@ -791,14 +791,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_7_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_7_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(7_1, "7.1", true); +static void ccw_machine_7_0_instance_options (MachineState *machine) { +ccw_machine_7_1_instance_options (machine); }static void ccw_machine_7_0_class_options (MachineClass *mc) { +ccw_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_CCW_MACHINE(7_0, "7.0", true); +DEFINE_CCW_MACHINE(7_0, "7.0", false);static void ccw_machine_6_2_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -380,6 +380,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_7_0[]; +extern const size_t hw_compat_7_0_len; +extern GlobalProperty hw_compat_6_2[];extern const size_t hw_compat_6_2_len;include/hw/i386/pc.h +3
-0@@ -202,6 +202,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_0[]; +extern const size_t pc_compat_7_0_len; +extern GlobalProperty pc_compat_6_2[];extern const size_t pc_compat_6_2_len;
Le 16/03/2022 à 15:55, Cornelia Huck a écrit :
Quoted 16 lines
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>--- 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(-)
...
Quoted 13 lines
hw/m68k/virt.c +5
-0@@ -316,10 +316,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE (7 ,1 , true) +
hw/m68k/virt.c type_init(virt_machine_register_types) · line 332
Quoted 10 lines
hw/m68k/virt.c +3
-1static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE(7, 0, true) +DEFINE_VIRT_MACHINE(7, 0, false)static void virt_machine_6_2_options (MachineClass *mc) {
For the m68k part:
Acked-by Laurent Vivier <[email protected]>
Quoted 15 lines · Cornelia Huck
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>--- 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(-)
...
Quoted 22 lines
hw/s390x/s390-virtio-ccw.c +10
-0@@ -791,14 +791,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_7_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_7_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(7_1, "7.1", true); +static void ccw_machine_7_0_instance_options (MachineState *machine) { +ccw_machine_7_1_instance_options (machine); }
hw/s390x/s390-virtio-ccw.c bool css_migration_enabled(void) · line 816
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +3
-1static void ccw_machine_7_0_class_options (MachineClass *mc) { +ccw_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_CCW_MACHINE(7_0, "7.0", true); +DEFINE_CCW_MACHINE(7_0, "7.0", false);static void ccw_machine_6_2_instance_options (MachineState *machine) {
Acked-by Thomas Huth <[email protected]>
Hi Connie,
Quoted 15 lines · Cornelia Huck
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>--- 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(-)
for the arm part:
Reviewed-by Eric Auger <[email protected]>
Thanks
Eric
Quoted 232 lines
hw/arm/virt.c +8
-1@@ -3017,10 +3017,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(7, 1) +static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) +DEFINE_VIRT_MACHINE(7, 0)static void virt_machine_6_2_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -37,6 +37,9 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_7_0[] = {}; +const size_t hw_compat_7_0_len =G_N_ELEMENTS (hw_compat_7_0); +GlobalProperty hw_compat_6_2[] = {};const size_t hw_compat_6_2_len =G_N_ELEMENTS (hw_compat_6_2);hw/i386/pc.c +3
-0@@ -95,6 +95,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_7_0[] = {}; +const size_t pc_compat_7_0_len =G_N_ELEMENTS (pc_compat_7_0); +GlobalProperty pc_compat_6_2[] = { {"virtio-mem" ,"unplugged-inaccessible" ,"off" }, };hw/i386/pc_piix.c +13
-1@@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_7_0_machine_options (MachineClass *m) +static void pc_i440fx_7_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v7_1,"pc-i440fx-7.1" ,NULL , + pc_i440fx_7_1_machine_options); + +static void pc_i440fx_7_0_machine_options (MachineClass *m) +{ +pc_i440fx_7_1_machine_options (m); + m->alias =NULL ; + m->is_default = 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); +} +DEFINE_I440FX_MACHINE (v7_0,"pc-i440fx-7.0" ,NULL , pc_i440fx_7_0_machine_options);hw/i386/pc_q35.c +12
-1@@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_7_0_machine_options (MachineClass *m) +static void pc_q35_7_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v7_1,"pc-q35-7.1" ,NULL , + pc_q35_7_1_machine_options); + +static void pc_q35_7_0_machine_options (MachineClass *m) +{ +pc_q35_7_1_machine_options (m); + m->alias =NULL ; +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); +} +DEFINE_Q35_MACHINE (v7_0,"pc-q35-7.0" ,NULL , pc_q35_7_0_machine_options);hw/m68k/virt.c +8
-1@@ -316,10 +316,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_7_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(7, 1, true) +static void virt_machine_7_0_options (MachineClass *mc) { +virt_machine_7_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE(7, 0, true) +DEFINE_VIRT_MACHINE(7, 0, false)static void virt_machine_6_2_options (MachineClass *mc) {hw/ppc/spapr.c +13
-2@@ -4703,15 +4703,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-7.1 +*/ +static void spapr_machine_7_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(7_1, "7.1", true); +/* * pseries-7.0 */ static void spapr_machine_7_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_SPAPR_MACHINE(7_0, "7.0", true); +DEFINE_SPAPR_MACHINE(7_0, "7.0", false);/* * pseries-6.2 hw/s390x/s390-virtio-ccw.c +13
-1@@ -791,14 +791,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_7_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_7_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(7_1, "7.1", true); +static void ccw_machine_7_0_instance_options (MachineState *machine) { +ccw_machine_7_1_instance_options (machine); }static void ccw_machine_7_0_class_options (MachineClass *mc) { +ccw_machine_7_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_CCW_MACHINE(7_0, "7.0", true); +DEFINE_CCW_MACHINE(7_0, "7.0", false);static void ccw_machine_6_2_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -380,6 +380,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_7_0[]; +extern const size_t hw_compat_7_0_len; +extern GlobalProperty hw_compat_6_2[];extern const size_t hw_compat_6_2_len;include/hw/i386/pc.h +3
-0@@ -202,6 +202,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_0[]; +extern const size_t pc_compat_7_0_len; +extern GlobalProperty pc_compat_6_2[];extern const size_t pc_compat_6_2_len;
Quoted 16 lines · Cornelia Huck
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>--- 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(-)
For s390x:
Reviewed-by Eric Farman <[email protected]>
..snip...