hw: add compat machines for 6.0
PATCH 1/1 hw: add compat machines for 6.0
Add 6.0 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 +8 -1
@@ -2587,10 +2587,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_6_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(6, 0) +static void virt_machine_5_2_options (MachineClass *mc) { +virt_machine_6_0_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +DEFINE_VIRT_MACHINE(5, 2)static void virt_machine_5_1_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_2[] = {}; +const size_t hw_compat_5_2_len =G_N_ELEMENTS (hw_compat_5_2); +GlobalProperty hw_compat_5_1[] = { {"vhost-scsi" ,"num_queues" ,"1" }, {"vhost-user-blk" ,"num-queues" ,"1" },
hw/i386/pc.c +3 -0
@@ -97,6 +97,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_5_2[] = {}; +const size_t pc_compat_5_2_len =G_N_ELEMENTS (pc_compat_5_2); +GlobalProperty pc_compat_5_1[] = { {"ICH9-LPC" ,"x-smi-cpu-hotplug" ,"off" }, };
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_2_machine_options (MachineClass *m) +static void pc_i440fx_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);
@@ -435,6 +435,18 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v6_0,"pc-i440fx-6.0" ,NULL , + pc_i440fx_6_0_machine_options); + +static void pc_i440fx_5_2_machine_options (MachineClass *m) +{ +pc_i440fx_6_0_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , pc_i440fx_5_2_machine_options);
hw/i386/pc_q35.c +12 -1
@@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_2_machine_options (MachineClass *m) +static void pc_q35_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);
@@ -352,6 +352,17 @@ static void pc_q35_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v6_0,"pc-q35-6.0" ,NULL , + pc_q35_6_0_machine_options); + +static void pc_q35_5_2_machine_options (MachineClass *m) +{ +pc_q35_6_0_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , pc_q35_5_2_machine_options);
hw/ppc/spapr.c +13 -2
@@ -4515,15 +4515,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-6.0 +*/ +static void spapr_machine_6_0_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(6_0, "6.0", true); +/* * pseries-5.2 */ static void spapr_machine_5_2_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +DEFINE_SPAPR_MACHINE(5_2, "5.2", false);/* * pseries-5.1
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -785,14 +785,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_6_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_6_0_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(6_0, "6.0", true); +static void ccw_machine_5_2_instance_options (MachineState *machine) { +ccw_machine_6_0_instance_options (machine); }static void ccw_machine_5_2_class_options (MachineClass *mc) { +ccw_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_CCW_MACHINE(5_2, "5.2", true); +DEFINE_CCW_MACHINE(5_2, "5.2", false);static void ccw_machine_5_1_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -310,6 +310,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_2[]; +extern const size_t hw_compat_5_2_len; +extern GlobalProperty hw_compat_5_1[];extern const size_t hw_compat_5_1_len;
include/hw/i386/pc.h +3 -0
@@ -191,6 +191,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_2[]; +extern const size_t pc_compat_5_2_len; +extern GlobalProperty pc_compat_5_1[];extern const size_t pc_compat_5_1_len;
Signature · 1 line
2.26.2
Quoted 1 line · Cornelia Huck
Add 6.0 machine types for arm/i440fx/q35/s390x/spapr.
ppc part
Acked-by David Gibson <[email protected]>
Quoted 221 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 +++++++++++++-- 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@@ -2587,10 +2587,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_6_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(6, 0) +static void virt_machine_5_2_options (MachineClass *mc) { +virt_machine_6_0_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +DEFINE_VIRT_MACHINE(5, 2)static void virt_machine_5_1_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_2[] = {}; +const size_t hw_compat_5_2_len =G_N_ELEMENTS (hw_compat_5_2); +GlobalProperty hw_compat_5_1[] = { {"vhost-scsi" ,"num_queues" ,"1" }, {"vhost-user-blk" ,"num-queues" ,"1" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_5_2[] = {}; +const size_t pc_compat_5_2_len =G_N_ELEMENTS (pc_compat_5_2); +GlobalProperty pc_compat_5_1[] = { {"ICH9-LPC" ,"x-smi-cpu-hotplug" ,"off" }, };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_2_machine_options (MachineClass *m) +static void pc_i440fx_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v6_0,"pc-i440fx-6.0" ,NULL , + pc_i440fx_6_0_machine_options); + +static void pc_i440fx_5_2_machine_options (MachineClass *m) +{ +pc_i440fx_6_0_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , pc_i440fx_5_2_machine_options);hw/i386/pc_q35.c +12
-1@@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_2_machine_options (MachineClass *m) +static void pc_q35_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -352,6 +352,17 @@ static void pc_q35_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v6_0,"pc-q35-6.0" ,NULL , + pc_q35_6_0_machine_options); + +static void pc_q35_5_2_machine_options (MachineClass *m) +{ +pc_q35_6_0_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , pc_q35_5_2_machine_options);hw/ppc/spapr.c +13
-2@@ -4515,15 +4515,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-6.0 +*/ +static void spapr_machine_6_0_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(6_0, "6.0", true); +/* * pseries-5.2 */ static void spapr_machine_5_2_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +DEFINE_SPAPR_MACHINE(5_2, "5.2", false);/* * pseries-5.1 hw/s390x/s390-virtio-ccw.c +13
-1@@ -785,14 +785,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_6_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_6_0_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(6_0, "6.0", true); +static void ccw_machine_5_2_instance_options (MachineState *machine) { +ccw_machine_6_0_instance_options (machine); }static void ccw_machine_5_2_class_options (MachineClass *mc) { +ccw_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_CCW_MACHINE(5_2, "5.2", true); +DEFINE_CCW_MACHINE(5_2, "5.2", false);static void ccw_machine_5_1_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -310,6 +310,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_2[]; +extern const size_t hw_compat_5_2_len; +extern GlobalProperty hw_compat_5_1[];extern const size_t hw_compat_5_1_len;include/hw/i386/pc.h +3
-0@@ -191,6 +191,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_2[]; +extern const size_t pc_compat_5_2_len; +extern GlobalProperty pc_compat_5_1[];extern const size_t pc_compat_5_1_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 3 lines · Cornelia Huck
Add 6.0 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
pc part
Reviewed-by Michael S. Tsirkin <[email protected]>
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@@ -2587,10 +2587,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_6_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(6, 0) +static void virt_machine_5_2_options (MachineClass *mc) { +virt_machine_6_0_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +DEFINE_VIRT_MACHINE(5, 2)static void virt_machine_5_1_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_2[] = {}; +const size_t hw_compat_5_2_len =G_N_ELEMENTS (hw_compat_5_2); +GlobalProperty hw_compat_5_1[] = { {"vhost-scsi" ,"num_queues" ,"1" }, {"vhost-user-blk" ,"num-queues" ,"1" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_5_2[] = {}; +const size_t pc_compat_5_2_len =G_N_ELEMENTS (pc_compat_5_2); +GlobalProperty pc_compat_5_1[] = { {"ICH9-LPC" ,"x-smi-cpu-hotplug" ,"off" }, };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_2_machine_options (MachineClass *m) +static void pc_i440fx_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v6_0,"pc-i440fx-6.0" ,NULL , + pc_i440fx_6_0_machine_options); + +static void pc_i440fx_5_2_machine_options (MachineClass *m) +{ +pc_i440fx_6_0_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , pc_i440fx_5_2_machine_options);hw/i386/pc_q35.c +12
-1@@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_2_machine_options (MachineClass *m) +static void pc_q35_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -352,6 +352,17 @@ static void pc_q35_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v6_0,"pc-q35-6.0" ,NULL , + pc_q35_6_0_machine_options); + +static void pc_q35_5_2_machine_options (MachineClass *m) +{ +pc_q35_6_0_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , pc_q35_5_2_machine_options);hw/ppc/spapr.c +13
-2@@ -4515,15 +4515,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-6.0 +*/ +static void spapr_machine_6_0_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(6_0, "6.0", true); +/* * pseries-5.2 */ static void spapr_machine_5_2_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +DEFINE_SPAPR_MACHINE(5_2, "5.2", false);/* * pseries-5.1 hw/s390x/s390-virtio-ccw.c +13
-1@@ -785,14 +785,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_6_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_6_0_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(6_0, "6.0", true); +static void ccw_machine_5_2_instance_options (MachineState *machine) { +ccw_machine_6_0_instance_options (machine); }static void ccw_machine_5_2_class_options (MachineClass *mc) { +ccw_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_CCW_MACHINE(5_2, "5.2", true); +DEFINE_CCW_MACHINE(5_2, "5.2", false);static void ccw_machine_5_1_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -310,6 +310,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_2[]; +extern const size_t hw_compat_5_2_len; +extern GlobalProperty hw_compat_5_1[];extern const size_t hw_compat_5_1_len;include/hw/i386/pc.h +3
-0@@ -191,6 +191,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_2[]; +extern const size_t pc_compat_5_2_len; +extern GlobalProperty pc_compat_5_1[];extern const size_t pc_compat_5_1_len;Signature · 1 line
2.26.2
Quoted 43 lines · On Mon, 9 Nov 2020 18:39:28 +0100 Cornelia Huck <[email protected]> wrote:
Add 6.0 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 +8
-1@@ -2587,10 +2587,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_6_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(6, 0) +static void virt_machine_5_2_options (MachineClass *mc) { +virt_machine_6_0_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) +DEFINE_VIRT_MACHINE(5, 2)static void virt_machine_5_1_options (MachineClass *mc) {hw/core/machine.c +0
-0
hw/core/machine.c line 31
Quoted 4 lines
hw/core/machine.c +1
-0@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_2[] = {};
Maybe worth putting the }; on the next line so that the next change has a prettier diff ?
Apart from that,
Reviewed-by Greg Kurz <[email protected]>
Quoted 175 lines
hw/core/machine.c +2
-0+const size_t hw_compat_5_2_len =G_N_ELEMENTS (hw_compat_5_2); +GlobalProperty hw_compat_5_1[] = { {"vhost-scsi" ,"num_queues" ,"1" }, {"vhost-user-blk" ,"num-queues" ,"1" },hw/i386/pc.c +3
-0@@ -97,6 +97,9 @@#include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_5_2[] = {}; +const size_t pc_compat_5_2_len =G_N_ELEMENTS (pc_compat_5_2); +GlobalProperty pc_compat_5_1[] = { {"ICH9-LPC" ,"x-smi-cpu-hotplug" ,"off" }, };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_2_machine_options (MachineClass *m) +static void pc_i440fx_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -435,6 +435,18 @@ static void pc_i440fx_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v6_0,"pc-i440fx-6.0" ,NULL , + pc_i440fx_6_0_machine_options); + +static void pc_i440fx_5_2_machine_options (MachineClass *m) +{ +pc_i440fx_6_0_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_I440FX_MACHINE (v5_2,"pc-i440fx-5.2" ,NULL , pc_i440fx_5_2_machine_options);hw/i386/pc_q35.c +12
-1@@ -344,7 +344,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_2_machine_options (MachineClass *m) +static void pc_q35_6_0_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -352,6 +352,17 @@ static void pc_q35_5_2_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v6_0,"pc-q35-6.0" ,NULL , + pc_q35_6_0_machine_options); + +static void pc_q35_5_2_machine_options (MachineClass *m) +{ +pc_q35_6_0_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_2, hw_compat_5_2_len); +compat_props_add (m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +} +DEFINE_Q35_MACHINE (v5_2,"pc-q35-5.2" ,NULL , pc_q35_5_2_machine_options);hw/ppc/spapr.c +13
-2@@ -4515,15 +4515,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-6.0 +*/ +static void spapr_machine_6_0_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(6_0, "6.0", true); +/* * pseries-5.2 */ static void spapr_machine_5_2_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_SPAPR_MACHINE(5_2, "5.2", true); +DEFINE_SPAPR_MACHINE(5_2, "5.2", false);/* * pseries-5.1 hw/s390x/s390-virtio-ccw.c +13
-1@@ -785,14 +785,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_6_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_6_0_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(6_0, "6.0", true); +static void ccw_machine_5_2_instance_options (MachineState *machine) { +ccw_machine_6_0_instance_options (machine); }static void ccw_machine_5_2_class_options (MachineClass *mc) { +ccw_machine_6_0_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); } -DEFINE_CCW_MACHINE(5_2, "5.2", true); +DEFINE_CCW_MACHINE(5_2, "5.2", false);static void ccw_machine_5_1_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -310,6 +310,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_2[]; +extern const size_t hw_compat_5_2_len; +extern GlobalProperty hw_compat_5_1[];extern const size_t hw_compat_5_1_len;include/hw/i386/pc.h +3
-0@@ -191,6 +191,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_2[]; +extern const size_t pc_compat_5_2_len; +extern GlobalProperty pc_compat_5_1[];extern const size_t pc_compat_5_1_len;
Quoted 18 lines · On Mon, 16 Nov 2020 11:23:14 +0100 Greg Kurz <[email protected]> wrote:
Quoted 15 lines · On Mon, 9 Nov 2020 18:39:28 +0100 Cornelia Huck <[email protected]> wrote:
Add 6.0 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(-)
(...)
Quoted 8 lines
Quoted 8 lines
hw/core/machine.c +0
-0@@ -28,6 +28,9 @@#include "hw/mem/nvdimm.h" #include "migration/vmstate.h"
Quoted 4 lines
hw/core/machine.c line 31
Quoted 1 line
hw/core/machine.c +1
-0+GlobalProperty hw_compat_5_2[] = {};Maybe worth putting the }; on the next line so that the next change has a prettier diff ?
That's mostly because I always copy from the last incarnation of that patch; but can try to remember to change next time.
Quoted 4 lines
Apart from that,
Reviewed-by Greg Kurz <[email protected]>
Thanks!