hw: add compat machines for 5.2
PATCH 1/1 hw: add compat machines for 5.2
Add 5.2 machine types for arm/i440fx/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/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(-)
hw/arm/virt.c +8 -1
@@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +static void virt_machine_5_1_options (MachineClass *mc) { +virt_machine_5_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_1[] = {}; +const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1); +GlobalProperty hw_compat_5_0[] = { {"virtio-balloon-device" ,"page-poison" ,"false" }, {"vmport" ,"x-read-set-eax" ,"off" },
hw/i386/pc.c +3 -0
@@ -97,6 +97,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_1[] = {}; +const size_t pc_compat_5_1_len =G_N_ELEMENTS (pc_compat_5_1); +GlobalProperty pc_compat_5_0[] = {};const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0);
hw/i386/pc_piix.c +13 -1
@@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_5_1_machine_options (MachineClass *m) +static void pc_i440fx_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);
@@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , + pc_i440fx_5_2_machine_options); + +static void pc_i440fx_5_1_machine_options (MachineClass *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); +} +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , pc_i440fx_5_1_machine_options);
hw/i386/pc_q35.c +12 -1
@@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_1_machine_options (MachineClass *m) +static void pc_q35_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);
@@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , + pc_q35_5_2_machine_options); + +static void pc_q35_5_1_machine_options (MachineClass *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); +} +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , pc_q35_5_1_machine_options);
hw/ppc/spapr.c +13 -2
@@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.2 +*/ +static void spapr_machine_5_2_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +/* * pseries-5.1 */ static void spapr_machine_5_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +DEFINE_SPAPR_MACHINE(5_1, "5.1", false);/* * pseries-5.0
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -804,14 +804,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); +static void ccw_machine_5_1_instance_options (MachineState *machine) { +ccw_machine_5_2_instance_options (machine); }static void ccw_machine_5_1_class_options (MachineClass *mc) { +ccw_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false);static void ccw_machine_5_0_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -319,6 +319,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_1[]; +extern const size_t hw_compat_5_1_len; +extern GlobalProperty hw_compat_5_0[];extern const size_t hw_compat_5_0_len;
include/hw/i386/pc.h +3 -0
@@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid,const CPUArchIdList *apic_ids,GArray *entry); +extern GlobalProperty pc_compat_5_1[]; +extern const size_t pc_compat_5_1_len; +extern GlobalProperty pc_compat_5_0[];extern const size_t pc_compat_5_0_len;
Signature · 1 line
2.25.4
Quoted 14 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/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/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(-)
For the generic and s390x part:
Quoted 28 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/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/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(-)hw/arm/virt.c +5
-0@@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST (5 ,2 ) +
hw/arm/virt.c static void machvirt_machine_init(void) · line 2562
Quoted 10 lines
hw/arm/virt.c +3
-1static void virt_machine_5_1_options (MachineClass *mc) { +virt_machine_5_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {
For the above hw/arm/virt.c part
Quoted 2 lines · On Tue, 28 Jul 2020 11:46:45 +0200 Cornelia Huck <[email protected]> wrote:
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr.
Heh, you win the race for adding new machine types again :)
Quoted 8 lines
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/ppc/spapr.c | 15 +++++++++++++--
For ppc parts:
Quoted 212 lines
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(-)hw/arm/virt.c +8
-1@@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +static void virt_machine_5_1_options (MachineClass *mc) { +virt_machine_5_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_1[] = {}; +const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1); +GlobalProperty hw_compat_5_0[] = { {"virtio-balloon-device" ,"page-poison" ,"false" }, {"vmport" ,"x-read-set-eax" ,"off" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_1[] = {}; +const size_t pc_compat_5_1_len =G_N_ELEMENTS (pc_compat_5_1); +GlobalProperty pc_compat_5_0[] = {};const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0);hw/i386/pc_piix.c +13
-1@@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_5_1_machine_options (MachineClass *m) +static void pc_i440fx_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , + pc_i440fx_5_2_machine_options); + +static void pc_i440fx_5_1_machine_options (MachineClass *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); +} +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , pc_i440fx_5_1_machine_options);hw/i386/pc_q35.c +12
-1@@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_1_machine_options (MachineClass *m) +static void pc_q35_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , + pc_q35_5_2_machine_options); + +static void pc_q35_5_1_machine_options (MachineClass *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); +} +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , pc_q35_5_1_machine_options);hw/ppc/spapr.c +13
-2@@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.2 +*/ +static void spapr_machine_5_2_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +/* * pseries-5.1 */ static void spapr_machine_5_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +DEFINE_SPAPR_MACHINE(5_1, "5.1", false);/* * pseries-5.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -804,14 +804,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); +static void ccw_machine_5_1_instance_options (MachineState *machine) { +ccw_machine_5_2_instance_options (machine); }static void ccw_machine_5_1_class_options (MachineClass *mc) { +ccw_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false);static void ccw_machine_5_0_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -319,6 +319,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_1[]; +extern const size_t hw_compat_5_1_len; +extern GlobalProperty hw_compat_5_0[];extern const size_t hw_compat_5_0_len;include/hw/i386/pc.h +3
-0@@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid,const CPUArchIdList *apic_ids,GArray *entry); +extern GlobalProperty pc_compat_5_1[]; +extern const size_t pc_compat_5_1_len; +extern GlobalProperty pc_compat_5_0[];extern const size_t pc_compat_5_0_len;
Quoted 3 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
ppc parts
Quoted 219 lines
--- 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(-)hw/arm/virt.c +8
-1@@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +static void virt_machine_5_1_options (MachineClass *mc) { +virt_machine_5_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_1[] = {}; +const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1); +GlobalProperty hw_compat_5_0[] = { {"virtio-balloon-device" ,"page-poison" ,"false" }, {"vmport" ,"x-read-set-eax" ,"off" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_1[] = {}; +const size_t pc_compat_5_1_len =G_N_ELEMENTS (pc_compat_5_1); +GlobalProperty pc_compat_5_0[] = {};const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0);hw/i386/pc_piix.c +13
-1@@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_5_1_machine_options (MachineClass *m) +static void pc_i440fx_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , + pc_i440fx_5_2_machine_options); + +static void pc_i440fx_5_1_machine_options (MachineClass *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); +} +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , pc_i440fx_5_1_machine_options);hw/i386/pc_q35.c +12
-1@@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_1_machine_options (MachineClass *m) +static void pc_q35_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , + pc_q35_5_2_machine_options); + +static void pc_q35_5_1_machine_options (MachineClass *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); +} +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , pc_q35_5_1_machine_options);hw/ppc/spapr.c +13
-2@@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.2 +*/ +static void spapr_machine_5_2_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +/* * pseries-5.1 */ static void spapr_machine_5_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +DEFINE_SPAPR_MACHINE(5_1, "5.1", false);/* * pseries-5.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -804,14 +804,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); +static void ccw_machine_5_1_instance_options (MachineState *machine) { +ccw_machine_5_2_instance_options (machine); }static void ccw_machine_5_1_class_options (MachineClass *mc) { +ccw_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false);static void ccw_machine_5_0_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -319,6 +319,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_1[]; +extern const size_t hw_compat_5_1_len; +extern GlobalProperty hw_compat_5_0[];extern const size_t hw_compat_5_0_len;include/hw/i386/pc.h +3
-0@@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid,const CPUArchIdList *apic_ids,GArray *entry); +extern GlobalProperty pc_compat_5_1[]; +extern const size_t pc_compat_5_1_len; +extern GlobalProperty pc_compat_5_0[];extern const size_t pc_compat_5_0_len;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 11 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/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/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
Quoted 212 lines
include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 9 files changed, 71 insertions(+), 6 deletions(-)hw/arm/virt.c +8
-1@@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +static void virt_machine_5_1_options (MachineClass *mc) { +virt_machine_5_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_1[] = {}; +const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1); +GlobalProperty hw_compat_5_0[] = { {"virtio-balloon-device" ,"page-poison" ,"false" }, {"vmport" ,"x-read-set-eax" ,"off" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_1[] = {}; +const size_t pc_compat_5_1_len =G_N_ELEMENTS (pc_compat_5_1); +GlobalProperty pc_compat_5_0[] = {};const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0);hw/i386/pc_piix.c +13
-1@@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_5_1_machine_options (MachineClass *m) +static void pc_i440fx_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , + pc_i440fx_5_2_machine_options); + +static void pc_i440fx_5_1_machine_options (MachineClass *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); +} +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , pc_i440fx_5_1_machine_options);hw/i386/pc_q35.c +12
-1@@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_1_machine_options (MachineClass *m) +static void pc_q35_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , + pc_q35_5_2_machine_options); + +static void pc_q35_5_1_machine_options (MachineClass *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); +} +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , pc_q35_5_1_machine_options);hw/ppc/spapr.c +13
-2@@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.2 +*/ +static void spapr_machine_5_2_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +/* * pseries-5.1 */ static void spapr_machine_5_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +DEFINE_SPAPR_MACHINE(5_1, "5.1", false);/* * pseries-5.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -804,14 +804,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); +static void ccw_machine_5_1_instance_options (MachineState *machine) { +ccw_machine_5_2_instance_options (machine); }static void ccw_machine_5_1_class_options (MachineClass *mc) { +ccw_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false);static void ccw_machine_5_0_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -319,6 +319,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_1[]; +extern const size_t hw_compat_5_1_len; +extern GlobalProperty hw_compat_5_0[];extern const size_t hw_compat_5_0_len;include/hw/i386/pc.h +3
-0@@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid,const CPUArchIdList *apic_ids,GArray *entry); +extern GlobalProperty pc_compat_5_1[]; +extern const size_t pc_compat_5_1_len; +extern GlobalProperty pc_compat_5_0[];extern const size_t pc_compat_5_0_len;
Quoted 3 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
We merge this kind of thing after the release, right?
Quoted 221 lines
--- 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(-)hw/arm/virt.c +8
-1@@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +static void virt_machine_5_1_options (MachineClass *mc) { +virt_machine_5_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {hw/core/machine.c +3
-0@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_1[] = {}; +const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1); +GlobalProperty hw_compat_5_0[] = { {"virtio-balloon-device" ,"page-poison" ,"false" }, {"vmport" ,"x-read-set-eax" ,"off" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_1[] = {}; +const size_t pc_compat_5_1_len =G_N_ELEMENTS (pc_compat_5_1); +GlobalProperty pc_compat_5_0[] = {};const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0);hw/i386/pc_piix.c +13
-1@@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_VMBUS_BRIDGE ); } -static void pc_i440fx_5_1_machine_options (MachineClass *m) +static void pc_i440fx_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , + pc_i440fx_5_2_machine_options); + +static void pc_i440fx_5_1_machine_options (MachineClass *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); +} +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , pc_i440fx_5_1_machine_options);hw/i386/pc_q35.c +12
-1@@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_1_machine_options (MachineClass *m) +static void pc_q35_5_2_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , + pc_q35_5_2_machine_options); + +static void pc_q35_5_1_machine_options (MachineClass *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); +} +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , pc_q35_5_1_machine_options);hw/ppc/spapr.c +13
-2@@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.2 +*/ +static void spapr_machine_5_2_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +/* * pseries-5.1 */ static void spapr_machine_5_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +DEFINE_SPAPR_MACHINE(5_1, "5.1", false);/* * pseries-5.0 hw/s390x/s390-virtio-ccw.c +13
-1@@ -804,14 +804,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); +static void ccw_machine_5_1_instance_options (MachineState *machine) { +ccw_machine_5_2_instance_options (machine); }static void ccw_machine_5_1_class_options (MachineClass *mc) { +ccw_machine_5_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false);static void ccw_machine_5_0_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -319,6 +319,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_1[]; +extern const size_t hw_compat_5_1_len; +extern GlobalProperty hw_compat_5_0[];extern const size_t hw_compat_5_0_len;include/hw/i386/pc.h +3
-0@@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid,const CPUArchIdList *apic_ids,GArray *entry); +extern GlobalProperty pc_compat_5_1[]; +extern const size_t pc_compat_5_1_len; +extern GlobalProperty pc_compat_5_0[];extern const size_t pc_compat_5_0_len;Signature · 1 line
2.25.4
Quoted 9 lines · On Wed, 29 Jul 2020 10:10:56 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 3 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>We merge this kind of thing after the release, right?
I guess the first person to do an arch pull request for 5.2 gets to merge this.
(I don't have much for s390 yet, so probably someone else.)
Quoted 13 lines
Quoted 13 lines
--- 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(-)