hw: add compat machines for 11.2
PATCH 1/1 hw: add compat machines for 11.2
Add 11.2 machine types for arm/i440fx/loongarch/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/loongarch/virt.c | 11 +++++++++-- hw/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/core/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 11 files changed, 85 insertions(+), 11 deletions(-)
hw/arm/virt.c +8 -1
@@ -4441,10 +4441,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -40,6 +40,9 @@#include "qemu/audio.h" #include "hw/arm/smmuv3.h" +GlobalProperty hw_compat_11_1[] = {}; +const size_t hw_compat_11_1_len =G_N_ELEMENTS (hw_compat_11_1); +GlobalProperty hw_compat_11_0[] = { {"chardev-vc" ,"encoding" ,"cp437" }, {"tpm-crb" ,"cap-chunk" ,"off" },
hw/i386/pc.c +3 -0
@@ -74,6 +74,9 @@#include "hw/xen/xen-bus.h" #endif +GlobalProperty pc_compat_11_1[] = {}; +const size_t pc_compat_11_1_len =G_N_ELEMENTS (pc_compat_11_1); +GlobalProperty pc_compat_11_0[] = {};const size_t pc_compat_11_0_len =G_N_ELEMENTS (pc_compat_11_0);
hw/i386/pc_piix.c +11 -2
@@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_piix_compat_defaults, pc_piix_compat_defaults_len); } -static void pc_i440fx_machine_11_1_options (MachineClass *m) +static void pc_i440fx_machine_11_2_options (MachineClass *m) {pc_i440fx_machine_options (m); } -DEFINE_I440FX_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_I440FX_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_i440fx_machine_11_1_options (MachineClass *m) +{ +pc_i440fx_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_I440FX_MACHINE (11 ,1 );static void pc_i440fx_machine_11_0_options (MachineClass *m) {
hw/i386/pc_q35.c +11 -2
@@ -383,12 +383,21 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_11_1_options (MachineClass *m) +static void pc_q35_machine_11_2_options (MachineClass *m) {pc_q35_machine_options (m); } -DEFINE_Q35_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_Q35_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_q35_machine_11_1_options (MachineClass *m) +{ +pc_q35_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_Q35_MACHINE (11 ,1 );static void pc_q35_machine_11_0_options (MachineClass *m) {
hw/loongarch/virt.c +9 -2
@@ -1465,7 +1465,6 @@ static void virt_class_init(ObjectClass *oc, const void *data) mc->default_ram_id ="loongarch.ram" ; mc->desc ="QEMU LoongArch Virtual Machine" ; mc->max_cpus =LOONGARCH_MAX_CPUS ; - mc->is_default =1 ; mc->default_kernel_irqchip_split = false; mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ;
@@ -1546,6 +1545,7 @@ static void virt_class_init(ObjectClass *oc, const void *data)MACHINE_VER_DEPRECATION (__VA_ARGS__); \if (latest) { \ mc->alias ="virt" ; \ + mc->is_default = true; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \
@@ -1600,7 +1600,14 @@ static void machvirt_machine_init(void)type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST (11 ,1 ) +DEFINE_VIRT_MACHINE (11 ,1 )
hw/m68k/virt.c +8 -1
@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)#define DEFINE_VIRT_MACHINE (major, minor) \ DEFINE_VIRT_MACHINE_IMPL(false, major, minor) +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {
hw/ppc/spapr.c +13 -2
@@ -4763,15 +4763,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE (major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) +/* +* pseries-11.2 +*/ +static void spapr_machine_11_2_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,2 ); +/* * pseries-11.1 */ static void spapr_machine_11_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_SPAPR_MACHINE (11 ,1 );/* * pseries-11.0
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -925,14 +925,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_11_2_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_11_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (11 ,2 ); +static void ccw_machine_11_1_instance_options (MachineState *machine) { +ccw_machine_11_2_instance_options (machine); }static void ccw_machine_11_1_class_options (MachineClass *mc) { +ccw_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_CCW_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_CCW_MACHINE (11 ,1 );static void ccw_machine_11_0_instance_options (MachineState *machine) {
include/hw/core/boards.h +3 -0
@@ -815,6 +815,9 @@ compat_props_add(GPtrArray *arr, } } +extern GlobalProperty hw_compat_11_1[]; +extern const size_t hw_compat_11_1_len; +extern GlobalProperty hw_compat_11_0[];extern const size_t hw_compat_11_0_len;
include/hw/i386/pc.h +3 -0
@@ -209,6 +209,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_11_1[]; +extern const size_t pc_compat_11_1_len; +extern GlobalProperty pc_compat_11_0[];extern const size_t pc_compat_11_0_len;
Signature · 1 line
2.55.0
Quoted 150 lines · Cornelia Huck
Add 11.2 machine types for arm/i440fx/loongarch/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/loongarch/virt.c | 11 +++++++++-- hw/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/core/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 11 files changed, 85 insertions(+), 11 deletions(-)hw/arm/virt.c +8
-1@@ -4441,10 +4441,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -40,6 +40,9 @@#include "qemu/audio.h" #include "hw/arm/smmuv3.h" +GlobalProperty hw_compat_11_1[] = {}; +const size_t hw_compat_11_1_len =G_N_ELEMENTS (hw_compat_11_1); +GlobalProperty hw_compat_11_0[] = { {"chardev-vc" ,"encoding" ,"cp437" }, {"tpm-crb" ,"cap-chunk" ,"off" },hw/i386/pc.c +3
-0@@ -74,6 +74,9 @@#include "hw/xen/xen-bus.h" #endif +GlobalProperty pc_compat_11_1[] = {}; +const size_t pc_compat_11_1_len =G_N_ELEMENTS (pc_compat_11_1); +GlobalProperty pc_compat_11_0[] = {};const size_t pc_compat_11_0_len =G_N_ELEMENTS (pc_compat_11_0);hw/i386/pc_piix.c +11
-2@@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_piix_compat_defaults, pc_piix_compat_defaults_len); } -static void pc_i440fx_machine_11_1_options (MachineClass *m) +static void pc_i440fx_machine_11_2_options (MachineClass *m) {pc_i440fx_machine_options (m); } -DEFINE_I440FX_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_I440FX_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_i440fx_machine_11_1_options (MachineClass *m) +{ +pc_i440fx_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_I440FX_MACHINE (11 ,1 );static void pc_i440fx_machine_11_0_options (MachineClass *m) {hw/i386/pc_q35.c +11
-2@@ -383,12 +383,21 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_11_1_options (MachineClass *m) +static void pc_q35_machine_11_2_options (MachineClass *m) {pc_q35_machine_options (m); } -DEFINE_Q35_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_Q35_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_q35_machine_11_1_options (MachineClass *m) +{ +pc_q35_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_Q35_MACHINE (11 ,1 );static void pc_q35_machine_11_0_options (MachineClass *m) {hw/loongarch/virt.c +3
-1@@ -1465,7 +1465,6 @@ static void virt_class_init(ObjectClass *oc, const void *data) mc->default_ram_id ="loongarch.ram" ; mc->desc ="QEMU LoongArch Virtual Machine" ; mc->max_cpus =LOONGARCH_MAX_CPUS ; - mc->is_default =1 ; mc->default_kernel_irqchip_split = false; mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ;@@ -1546,6 +1545,7 @@ static void virt_class_init(ObjectClass *oc, const void *data)MACHINE_VER_DEPRECATION (__VA_ARGS__); \if (latest) { \ mc->alias ="virt" ; \ + mc->is_default = true; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \@@ -1600,7 +1600,14 @@ static void machvirt_machine_init(void)type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{
hw/loongarch/virt.c static void machvirt_machine_init(void) · line 1613
Quoted 10 lines
hw/loongarch/virt.c +6
-1+} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST (11 ,1 ) +DEFINE_VIRT_MACHINE (11 ,1 )
With LoongArch part
Reviewed-by Bibo Mao <[email protected]>
Regards
Bibo Mao
Quoted 117 lines
hw/m68k/virt.c +8
-1@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)#define DEFINE_VIRT_MACHINE (major, minor) \ DEFINE_VIRT_MACHINE_IMPL(false, major, minor) +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {hw/ppc/spapr.c +13
-2@@ -4763,15 +4763,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE (major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) +/* +* pseries-11.2 +*/ +static void spapr_machine_11_2_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,2 ); +/* * pseries-11.1 */ static void spapr_machine_11_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_SPAPR_MACHINE (11 ,1 );/* * pseries-11.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -925,14 +925,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_11_2_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_11_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (11 ,2 ); +static void ccw_machine_11_1_instance_options (MachineState *machine) { +ccw_machine_11_2_instance_options (machine); }static void ccw_machine_11_1_class_options (MachineClass *mc) { +ccw_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_CCW_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_CCW_MACHINE (11 ,1 );static void ccw_machine_11_0_instance_options (MachineState *machine) {include/hw/core/boards.h +3
-0@@ -815,6 +815,9 @@ compat_props_add(GPtrArray *arr, } } +extern GlobalProperty hw_compat_11_1[]; +extern const size_t hw_compat_11_1_len; +extern GlobalProperty hw_compat_11_0[];extern const size_t hw_compat_11_0_len;include/hw/i386/pc.h +3
-0@@ -209,6 +209,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_11_1[]; +extern const size_t pc_compat_11_1_len; +extern GlobalProperty pc_compat_11_0[];extern const size_t pc_compat_11_0_len;
Quoted 45 lines · Cornelia Huck
Add 11.2 machine types for arm/i440fx/loongarch/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/loongarch/virt.c | 11 +++++++++-- hw/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/core/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 11 files changed, 85 insertions(+), 11 deletions(-)hw/arm/virt.c +8
-1@@ -4441,10 +4441,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {hw/core/machine.c +0
-0
hw/core/machine.c line 48
Quoted 9 lines
hw/core/machine.c +3
-0@@ -40,6 +40,9 @@#include "qemu/audio.h" #include "hw/arm/smmuv3.h" +GlobalProperty hw_compat_11_1[] = {}; +const size_t hw_compat_11_1_len =G_N_ELEMENTS (hw_compat_11_1); +GlobalProperty hw_compat_11_0[] = { {"chardev-vc" ,"encoding" ,"cp437" }, {"tpm-crb" ,"cap-chunk" ,"off" },
This hunk doesn't apply because of a5cff318f0 ("virtio-mmio: fix QUEUE_NUM_MAX"), but is easy to resolve. I'll fix/pick this.
Reviewed-by Eric Farman <[email protected]>
Quoted 222 lines
hw/i386/pc.c +3
-0@@ -74,6 +74,9 @@#include "hw/xen/xen-bus.h" #endif +GlobalProperty pc_compat_11_1[] = {}; +const size_t pc_compat_11_1_len =G_N_ELEMENTS (pc_compat_11_1); +GlobalProperty pc_compat_11_0[] = {};const size_t pc_compat_11_0_len =G_N_ELEMENTS (pc_compat_11_0);hw/i386/pc_piix.c +11
-2@@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_piix_compat_defaults, pc_piix_compat_defaults_len); } -static void pc_i440fx_machine_11_1_options (MachineClass *m) +static void pc_i440fx_machine_11_2_options (MachineClass *m) {pc_i440fx_machine_options (m); } -DEFINE_I440FX_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_I440FX_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_i440fx_machine_11_1_options (MachineClass *m) +{ +pc_i440fx_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_I440FX_MACHINE (11 ,1 );static void pc_i440fx_machine_11_0_options (MachineClass *m) {hw/i386/pc_q35.c +11
-2@@ -383,12 +383,21 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_11_1_options (MachineClass *m) +static void pc_q35_machine_11_2_options (MachineClass *m) {pc_q35_machine_options (m); } -DEFINE_Q35_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_Q35_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_q35_machine_11_1_options (MachineClass *m) +{ +pc_q35_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_Q35_MACHINE (11 ,1 );static void pc_q35_machine_11_0_options (MachineClass *m) {hw/loongarch/virt.c +9
-2@@ -1465,7 +1465,6 @@ static void virt_class_init(ObjectClass *oc, const void *data) mc->default_ram_id ="loongarch.ram" ; mc->desc ="QEMU LoongArch Virtual Machine" ; mc->max_cpus =LOONGARCH_MAX_CPUS ; - mc->is_default =1 ; mc->default_kernel_irqchip_split = false; mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ;@@ -1546,6 +1545,7 @@ static void virt_class_init(ObjectClass *oc, const void *data)MACHINE_VER_DEPRECATION (__VA_ARGS__); \if (latest) { \ mc->alias ="virt" ; \ + mc->is_default = true; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \@@ -1600,7 +1600,14 @@ static void machvirt_machine_init(void)type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST (11 ,1 ) +DEFINE_VIRT_MACHINE (11 ,1 )hw/m68k/virt.c +8
-1@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)#define DEFINE_VIRT_MACHINE (major, minor) \ DEFINE_VIRT_MACHINE_IMPL(false, major, minor) +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {hw/ppc/spapr.c +13
-2@@ -4763,15 +4763,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE (major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) +/* +* pseries-11.2 +*/ +static void spapr_machine_11_2_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,2 ); +/* * pseries-11.1 */ static void spapr_machine_11_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_SPAPR_MACHINE (11 ,1 );/* * pseries-11.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -925,14 +925,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_11_2_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_11_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (11 ,2 ); +static void ccw_machine_11_1_instance_options (MachineState *machine) { +ccw_machine_11_2_instance_options (machine); }static void ccw_machine_11_1_class_options (MachineClass *mc) { +ccw_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_CCW_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_CCW_MACHINE (11 ,1 );static void ccw_machine_11_0_instance_options (MachineState *machine) {include/hw/core/boards.h +3
-0@@ -815,6 +815,9 @@ compat_props_add(GPtrArray *arr, } } +extern GlobalProperty hw_compat_11_1[]; +extern const size_t hw_compat_11_1_len; +extern GlobalProperty hw_compat_11_0[];extern const size_t hw_compat_11_0_len;include/hw/i386/pc.h +3
-0@@ -209,6 +209,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_11_1[]; +extern const size_t pc_compat_11_1_len; +extern GlobalProperty pc_compat_11_0[];extern const size_t pc_compat_11_0_len;
Quoted 3 lines · Cornelia Huck
Add 11.2 machine types for arm/i440fx/loongarch/m68k/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
Quoted 275 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/loongarch/virt.c | 11 +++++++++-- hw/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/core/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 11 files changed, 85 insertions(+), 11 deletions(-)hw/arm/virt.c +8
-1@@ -4441,10 +4441,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -40,6 +40,9 @@#include "qemu/audio.h" #include "hw/arm/smmuv3.h" +GlobalProperty hw_compat_11_1[] = {}; +const size_t hw_compat_11_1_len =G_N_ELEMENTS (hw_compat_11_1); +GlobalProperty hw_compat_11_0[] = { {"chardev-vc" ,"encoding" ,"cp437" }, {"tpm-crb" ,"cap-chunk" ,"off" },hw/i386/pc.c +3
-0@@ -74,6 +74,9 @@#include "hw/xen/xen-bus.h" #endif +GlobalProperty pc_compat_11_1[] = {}; +const size_t pc_compat_11_1_len =G_N_ELEMENTS (pc_compat_11_1); +GlobalProperty pc_compat_11_0[] = {};const size_t pc_compat_11_0_len =G_N_ELEMENTS (pc_compat_11_0);hw/i386/pc_piix.c +11
-2@@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_piix_compat_defaults, pc_piix_compat_defaults_len); } -static void pc_i440fx_machine_11_1_options (MachineClass *m) +static void pc_i440fx_machine_11_2_options (MachineClass *m) {pc_i440fx_machine_options (m); } -DEFINE_I440FX_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_I440FX_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_i440fx_machine_11_1_options (MachineClass *m) +{ +pc_i440fx_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_I440FX_MACHINE (11 ,1 );static void pc_i440fx_machine_11_0_options (MachineClass *m) {hw/i386/pc_q35.c +11
-2@@ -383,12 +383,21 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_11_1_options (MachineClass *m) +static void pc_q35_machine_11_2_options (MachineClass *m) {pc_q35_machine_options (m); } -DEFINE_Q35_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_Q35_MACHINE_AS_LATEST (11 ,2 ); + +static void pc_q35_machine_11_1_options (MachineClass *m) +{ +pc_q35_machine_11_2_options (m); +compat_props_add (m->compat_props, hw_compat_11_1, hw_compat_11_1_len); +compat_props_add (m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_Q35_MACHINE (11 ,1 );static void pc_q35_machine_11_0_options (MachineClass *m) {hw/loongarch/virt.c +9
-2@@ -1465,7 +1465,6 @@ static void virt_class_init(ObjectClass *oc, const void *data) mc->default_ram_id ="loongarch.ram" ; mc->desc ="QEMU LoongArch Virtual Machine" ; mc->max_cpus =LOONGARCH_MAX_CPUS ; - mc->is_default =1 ; mc->default_kernel_irqchip_split = false; mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ;@@ -1546,6 +1545,7 @@ static void virt_class_init(ObjectClass *oc, const void *data)MACHINE_VER_DEPRECATION (__VA_ARGS__); \if (latest) { \ mc->alias ="virt" ; \ + mc->is_default = true; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \@@ -1600,7 +1600,14 @@ static void machvirt_machine_init(void)type_init (machvirt_machine_init); +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST (11 ,1 ) +DEFINE_VIRT_MACHINE (11 ,1 )hw/m68k/virt.c +8
-1@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)#define DEFINE_VIRT_MACHINE (major, minor) \ DEFINE_VIRT_MACHINE_IMPL(false, major, minor) +static void virt_machine_11_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 2) +static void virt_machine_11_1_options (MachineClass *mc) { +virt_machine_11_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +DEFINE_VIRT_MACHINE(11, 1)static void virt_machine_11_0_options (MachineClass *mc) {hw/ppc/spapr.c +13
-2@@ -4763,15 +4763,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE (major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) +/* +* pseries-11.2 +*/ +static void spapr_machine_11_2_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,2 ); +/* * pseries-11.1 */ static void spapr_machine_11_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_SPAPR_MACHINE (11 ,1 );/* * pseries-11.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -925,14 +925,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_11_2_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_11_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (11 ,2 ); +static void ccw_machine_11_1_instance_options (MachineState *machine) { +ccw_machine_11_2_instance_options (machine); }static void ccw_machine_11_1_class_options (MachineClass *mc) { +ccw_machine_11_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_11_1, hw_compat_11_1_len); } -DEFINE_CCW_MACHINE_AS_LATEST (11 ,1 ); +DEFINE_CCW_MACHINE (11 ,1 );static void ccw_machine_11_0_instance_options (MachineState *machine) {include/hw/core/boards.h +3
-0@@ -815,6 +815,9 @@ compat_props_add(GPtrArray *arr, } } +extern GlobalProperty hw_compat_11_1[]; +extern const size_t hw_compat_11_1_len; +extern GlobalProperty hw_compat_11_0[];extern const size_t hw_compat_11_0_len;include/hw/i386/pc.h +3
-0@@ -209,6 +209,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_11_1[]; +extern const size_t pc_compat_11_1_len; +extern GlobalProperty pc_compat_11_0[];extern const size_t pc_compat_11_0_len;Signature · 1 line
2.55.0