hw: add compat machines for 10.1
PATCH 1/1 hw: add compat machines for 10.1
Add 10.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 | 13 +++++++++++-- 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, 76 insertions(+), 9 deletions(-)
hw/arm/virt.c +8 -1
@@ -3408,10 +3408,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_10_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) +static void virt_machine_10_0_options (MachineClass *mc) { +virt_machine_10_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0) +DEFINE_VIRT_MACHINE(10, 0)static void virt_machine_9_2_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -37,6 +37,9 @@#include "hw/virtio/virtio-iommu.h" #include "audio/audio.h" +GlobalProperty hw_compat_10_0[] = {}; +const size_t hw_compat_10_0_len =G_N_ELEMENTS (hw_compat_10_0); +GlobalProperty hw_compat_9_2[] = { {"arm-cpu" ,"backcompat-pauth-default-use-qarma5" ,"true" }, {"virtio-balloon-pci" ,"vectors" ,"0" },
hw/i386/pc.c +3 -0
@@ -79,6 +79,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_10_0[] = {}; +const size_t pc_compat_10_0_len =G_N_ELEMENTS (pc_compat_10_0); +GlobalProperty pc_compat_9_2[] = {};const size_t pc_compat_9_2_len =G_N_ELEMENTS (pc_compat_9_2);
hw/i386/pc_piix.c +11 -2
@@ -479,12 +479,21 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_10_0_options (MachineClass *m) +static void pc_i440fx_machine_10_1_options (MachineClass *m) {pc_i440fx_machine_options (m); } -DEFINE_I440FX_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_I440FX_MACHINE_AS_LATEST (10 ,1 ); + +static void pc_i440fx_machine_10_0_options (MachineClass *m) +{ +pc_i440fx_machine_10_1_options (m); +compat_props_add (m->compat_props, hw_compat_10_0, hw_compat_10_0_len); +compat_props_add (m->compat_props, pc_compat_10_0, pc_compat_10_0_len); +} + +DEFINE_I440FX_MACHINE (10 ,0 );static void pc_i440fx_machine_9_2_options (MachineClass *m) {
hw/i386/pc_q35.c +11 -2
@@ -361,12 +361,21 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_10_0_options (MachineClass *m) +static void pc_q35_machine_10_1_options (MachineClass *m) {pc_q35_machine_options (m); } -DEFINE_Q35_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_Q35_MACHINE_AS_LATEST (10 ,1 ); + +static void pc_q35_machine_10_0_options (MachineClass *m) +{ +pc_q35_machine_10_1_options (m); +compat_props_add (m->compat_props, hw_compat_10_0, hw_compat_10_0_len); +compat_props_add (m->compat_props, pc_compat_10_0, pc_compat_10_0_len); +} + +DEFINE_Q35_MACHINE (10 ,0 );static void pc_q35_machine_9_2_options (MachineClass *m) {
hw/m68k/virt.c +8 -1
@@ -366,10 +366,17 @@ type_init(virt_machine_register_types)#define DEFINE_VIRT_MACHINE (major, minor) \ DEFINE_VIRT_MACHINE_IMPL(false, major, minor) +static void virt_machine_10_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) +static void virt_machine_10_0_options (MachineClass *mc) { +virt_machine_10_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0) +DEFINE_VIRT_MACHINE(10, 0)static void virt_machine_9_2_options (MachineClass *mc) {
hw/ppc/spapr.c +13 -2
@@ -4766,15 +4766,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE (major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) +/* +* pseries-10.1 +*/ +static void spapr_machine_10_1_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (10 ,1 ); +/* * pseries-10.0 */ static void spapr_machine_10_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_10_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_SPAPR_MACHINE (10 ,0 );/* * pseries-9.2
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -921,14 +921,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_10_1_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_10_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (10 ,1 ); +static void ccw_machine_10_0_instance_options (MachineState *machine) { +ccw_machine_10_1_instance_options (machine); }static void ccw_machine_10_0_class_options (MachineClass *mc) { +ccw_machine_10_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_CCW_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_CCW_MACHINE (10 ,0 );static void ccw_machine_9_2_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -761,6 +761,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_10_0[]; +extern const size_t hw_compat_10_0_len; +extern GlobalProperty hw_compat_9_2[];extern const size_t hw_compat_9_2_len;
include/hw/i386/pc.h +3 -0
@@ -215,6 +215,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);/* sgx.c */ void pc_machine_init_sgx_epc (PCMachineState *pcms); +extern GlobalProperty pc_compat_10_0[]; +extern const size_t pc_compat_10_0_len; +extern GlobalProperty pc_compat_9_2[];extern const size_t pc_compat_9_2_len;
Signature · 1 line
2.49.0
Quoted 3 lines · Cornelia Huck
Add 10.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
Quoted 238 lines
--- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 13 +++++++++++-- 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, 76 insertions(+), 9 deletions(-)hw/arm/virt.c +8
-1@@ -3408,10 +3408,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_10_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) +static void virt_machine_10_0_options (MachineClass *mc) { +virt_machine_10_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0) +DEFINE_VIRT_MACHINE(10, 0)static void virt_machine_9_2_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -37,6 +37,9 @@#include "hw/virtio/virtio-iommu.h" #include "audio/audio.h" +GlobalProperty hw_compat_10_0[] = {}; +const size_t hw_compat_10_0_len =G_N_ELEMENTS (hw_compat_10_0); +GlobalProperty hw_compat_9_2[] = { {"arm-cpu" ,"backcompat-pauth-default-use-qarma5" ,"true" }, {"virtio-balloon-pci" ,"vectors" ,"0" },hw/i386/pc.c +3
-0@@ -79,6 +79,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_10_0[] = {}; +const size_t pc_compat_10_0_len =G_N_ELEMENTS (pc_compat_10_0); +GlobalProperty pc_compat_9_2[] = {};const size_t pc_compat_9_2_len =G_N_ELEMENTS (pc_compat_9_2);hw/i386/pc_piix.c +11
-2@@ -479,12 +479,21 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_10_0_options (MachineClass *m) +static void pc_i440fx_machine_10_1_options (MachineClass *m) {pc_i440fx_machine_options (m); } -DEFINE_I440FX_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_I440FX_MACHINE_AS_LATEST (10 ,1 ); + +static void pc_i440fx_machine_10_0_options (MachineClass *m) +{ +pc_i440fx_machine_10_1_options (m); +compat_props_add (m->compat_props, hw_compat_10_0, hw_compat_10_0_len); +compat_props_add (m->compat_props, pc_compat_10_0, pc_compat_10_0_len); +} + +DEFINE_I440FX_MACHINE (10 ,0 );static void pc_i440fx_machine_9_2_options (MachineClass *m) {hw/i386/pc_q35.c +11
-2@@ -361,12 +361,21 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_10_0_options (MachineClass *m) +static void pc_q35_machine_10_1_options (MachineClass *m) {pc_q35_machine_options (m); } -DEFINE_Q35_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_Q35_MACHINE_AS_LATEST (10 ,1 ); + +static void pc_q35_machine_10_0_options (MachineClass *m) +{ +pc_q35_machine_10_1_options (m); +compat_props_add (m->compat_props, hw_compat_10_0, hw_compat_10_0_len); +compat_props_add (m->compat_props, pc_compat_10_0, pc_compat_10_0_len); +} + +DEFINE_Q35_MACHINE (10 ,0 );static void pc_q35_machine_9_2_options (MachineClass *m) {hw/m68k/virt.c +8
-1@@ -366,10 +366,17 @@ type_init(virt_machine_register_types)#define DEFINE_VIRT_MACHINE (major, minor) \ DEFINE_VIRT_MACHINE_IMPL(false, major, minor) +static void virt_machine_10_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) +static void virt_machine_10_0_options (MachineClass *mc) { +virt_machine_10_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0) +DEFINE_VIRT_MACHINE(10, 0)static void virt_machine_9_2_options (MachineClass *mc) {hw/ppc/spapr.c +13
-2@@ -4766,15 +4766,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE (major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) +/* +* pseries-10.1 +*/ +static void spapr_machine_10_1_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (10 ,1 ); +/* * pseries-10.0 */ static void spapr_machine_10_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_10_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_SPAPR_MACHINE (10 ,0 );/* * pseries-9.2 hw/s390x/s390-virtio-ccw.c +13
-1@@ -921,14 +921,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_10_1_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_10_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (10 ,1 ); +static void ccw_machine_10_0_instance_options (MachineState *machine) { +ccw_machine_10_1_instance_options (machine); }static void ccw_machine_10_0_class_options (MachineClass *mc) { +ccw_machine_10_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } -DEFINE_CCW_MACHINE_AS_LATEST (10 ,0 ); +DEFINE_CCW_MACHINE (10 ,0 );static void ccw_machine_9_2_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -761,6 +761,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_10_0[]; +extern const size_t hw_compat_10_0_len; +extern GlobalProperty hw_compat_9_2[];extern const size_t hw_compat_9_2_len;include/hw/i386/pc.h +3
-0@@ -215,6 +215,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);/* sgx.c */ void pc_machine_init_sgx_epc (PCMachineState *pcms); +extern GlobalProperty pc_compat_10_0[]; +extern const size_t pc_compat_10_0_len; +extern GlobalProperty pc_compat_9_2[];extern const size_t pc_compat_9_2_len;Signature · 1 line
2.49.0
Quoted 15 lines · Cornelia Huck
Add 10.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 | 13 +++++++++++-- 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, 76 insertions(+), 9 deletions(-)
Reviewed-by Thomas Huth <[email protected]>
Quoted 7 lines · Cornelia Huck
Date: Mon, 14 Apr 2025 11:45:43 +0200
From: Cornelia Huck <[email protected]>
Subject: [PATCH] hw: add compat machines for 10.1Add 10.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
Quoted 12 lines
--- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 13 +++++++++++-- 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, 76 insertions(+), 9 deletions(-)
Reviewed-by Zhao Liu <[email protected]>