hw: add compat machines for 5.2
PATCH v2 1/1 hw: add compat machines for 5.2
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr.
Reviewed-by Andrew Jones <[email protected]>
Reviewed-by Michael S. Tsirkin <[email protected]>
Reviewed-by Greg Kurz <[email protected]>
Acked-by David Gibson <[email protected]>
Acked-by Thomas Huth <[email protected]>
Signed-off-by Cornelia Huck <[email protected]>
---
v1->v2: rebased on current master
For whoever needs this :) I will include it into an eventually coming s390x pull request, if nobody beats me to it.
--- 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[] = { {"pci-host-bridge" ,"x-config-reg-migration-enabled" ,"off" }, {"virtio-balloon-device" ,"page-poison" ,"false" },
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
@@ -801,14 +801,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 16 lines · Cornelia Huck
Add 5.2 machine types for arm/i440fx/q35/s390x/spapr.
Reviewed-by Andrew Jones <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Reviewed-by Greg Kurz <[email protected]>Acked-by David Gibson <[email protected]>Acked-by Thomas Huth <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
v1->v2: rebased on current masterFor whoever needs this :) I will include it into an eventually coming s390x pull request, if nobody beats me to it.
Quoted 11 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(-)
Reviewed-by Stefan Hajnoczi <[email protected]>