hw: add compat machines for 9.2
PATCH 1/1 hw: add compat machines for 9.2
Add 9.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
--- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)
hw/arm/virt.c +8 -1
@@ -3301,10 +3301,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_9_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(9, 2) +static void virt_machine_9_1_options (MachineClass *mc) { +virt_machine_9_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_9_1, hw_compat_9_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(9, 1) +DEFINE_VIRT_MACHINE(9, 1)static void virt_machine_9_0_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -34,6 +34,9 @@#include "hw/virtio/virtio-iommu.h" #include "audio/audio.h" +GlobalProperty hw_compat_9_1[] = {}; +const size_t hw_compat_9_1_len =G_N_ELEMENTS (hw_compat_9_1); +GlobalProperty hw_compat_9_0[] = { {"arm-cpu" ,"backcompat-cntfrq" ,"true" }, {"scsi-hd" ,"migrate-emulated-scsi-request" ,"false" },
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_9_1[] = {}; +const size_t pc_compat_9_1_len =G_N_ELEMENTS (pc_compat_9_1); +GlobalProperty pc_compat_9_0[] = { {TYPE_X86_CPU ,"x-amd-topoext-features-only" ,"false" }, { TYPE_X86_CPU, "x-l1-cache-per-thread", "false" },
hw/i386/pc_piix.c +12 -3
@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)
@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;compat_props_add (m->compat_props, hw_compat_9_0, hw_compat_9_0_len);
hw/i386/pc_q35.c +11 -2
@@ -361,19 +361,28 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } -static void pc_q35_machine_9_1_options (MachineClass *m) +static void pc_q35_machine_9_2_options (MachineClass *m) {pc_q35_machine_options (m); m->alias ="q35" ; } +DEFINE_Q35_MACHINE (9 ,2 ); + +static void pc_q35_machine_9_1_options (MachineClass *m) +{ +pc_q35_machine_9_2_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_Q35_MACHINE (9 ,1 );static void pc_q35_machine_9_0_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_9_1_options (m); - m->alias =NULL ; m->smbios_memory_device_size =16 * GiB;compat_props_add (m->compat_props, hw_compat_9_0, hw_compat_9_0_len);compat_props_add (m->compat_props, pc_compat_9_0, pc_compat_9_0_len);
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_9_2_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(9, 2) +static void virt_machine_9_1_options (MachineClass *mc) { +virt_machine_9_2_options (mc); +compat_props_add (mc->compat_props, hw_compat_9_1, hw_compat_9_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(9, 1) +DEFINE_VIRT_MACHINE(9, 1)static void virt_machine_9_0_options (MachineClass *mc) {
hw/ppc/spapr.c +13 -2
@@ -4837,15 +4837,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)#define DEFINE_SPAPR_MACHINE_TAGGED (major, minor, tag) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, _, tag) +/* +* pseries-9.2 +*/ +static void spapr_machine_9_2_class_options (MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST (9 ,2 ); +/* * pseries-9.1 */ static void spapr_machine_9_1_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_9_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_9_1, hw_compat_9_1_len); } -DEFINE_SPAPR_MACHINE_AS_LATEST (9 ,1 ); +DEFINE_SPAPR_MACHINE (9 ,1 );/* * pseries-9.0
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -871,14 +871,26 @@ static const TypeInfo ccw_machine_info = { DEFINE_CCW_MACHINE_IMPL(false, major, minor) +static void ccw_machine_9_2_instance_options (MachineState *machine) +{ +} + +static void ccw_machine_9_2_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST (9 ,2 ); +static void ccw_machine_9_1_instance_options (MachineState *machine) { +ccw_machine_9_2_instance_options (machine); }static void ccw_machine_9_1_class_options (MachineClass *mc) { +ccw_machine_9_2_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_9_1, hw_compat_9_1_len); } -DEFINE_CCW_MACHINE_AS_LATEST (9 ,1 ); +DEFINE_CCW_MACHINE (9 ,1 );static void ccw_machine_9_0_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -732,6 +732,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_9_1[]; +extern const size_t hw_compat_9_1_len; +extern GlobalProperty hw_compat_9_0[];extern const size_t hw_compat_9_0_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_9_1[]; +extern const size_t pc_compat_9_1_len; +extern GlobalProperty pc_compat_9_0[];extern const size_t pc_compat_9_0_len;
Signature · 1 line
2.46.0
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)
Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)
hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;
Feels like we should be adding an "_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias & is_default.
Not a thing your patch needs todo though.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 62 lines · Daniel P. Berrangé
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;Feels like we should be adding an "
_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias &is_default.
Quoted 1 line
Not a thing your patch needs todo though.
Yes, having to fiddle the is_default setting is a bit annoying. We still have the q35 vs pc alias issue, though. (I'm wondering if it is finally time to make q35 the default, and alias pc to it?)
Quoted 62 lines · Daniel P. Berrangé
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;Feels like we should be adding an "
_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias &is_default.
Quoted 1 line
Not a thing your patch needs todo though.
I've just a patch that does that now. If it looks good & you want to include it as a pre-requisite for your patch here feel free to grab, otherwise I can rebase it after your patch merges.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 64 lines · Daniel P. Berrangé
Quoted 62 lines · Daniel P. Berrangé
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;Feels like we should be adding an "
_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias &is_default.
Quoted 5 lines
Quoted 1 line
Not a thing your patch needs todo though.
I've just a patch that does that now. If it looks good & you want to include it as a pre-requisite for your patch here feel free to grab, otherwise I can rebase it after your patch merges.
I have this patch in my target-arm pullreq that's currently posted and pending merge, by the way.
-- PMM
Quoted 65 lines · Peter Maydell
Quoted 64 lines · Daniel P. Berrangé
Quoted 62 lines · Daniel P. Berrangé
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;Feels like we should be adding an "
_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias &is_default.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Not a thing your patch needs todo though.
I've just a patch that does that now. If it looks good & you want to include it as a pre-requisite for your patch here feel free to grab, otherwise I can rebase it after your patch merges.
I have this patch in my target-arm pullreq that's currently posted and pending merge, by the way.
Ah ok, i'll rebase on top of that. then
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Michael S. Tsirkin
Reviewed-byQuoted 67 lines · Peter Maydell
Quoted 66 lines · Daniel P. Berrangé
Quoted 63 lines · Daniel P. Berrangé
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;Feels like we should be adding an "
_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias &is_default.Not a thing your patch needs todo though.
Quoted 8 lines
Quoted 3 lines
I've just a patch that does that now. If it looks good & you want to include it as a pre-requisite for your patch here feel free to grab, otherwise I can rebase it after your patch merges.
I have this patch in my target-arm pullreq that's currently posted and pending merge, by the way.
-- PMM
Ok feel free to tack on
Quoted 73 lines · Michael S. Tsirkin
Quoted 71 lines · Peter Maydell
Quoted 69 lines · Daniel P. Berrangé
Quoted 62 lines · Daniel P. Berrangé
Quoted 15 lines · Cornelia Huck
Add 9.2 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 | 15 ++++++++++++--- 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, 77 insertions(+), 10 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Quoted 31 lines
hw/i386/pc_piix.c +12
-1@@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) "Use a different south bridge than PIIX3"); } -static void pc_i440fx_machine_9_1_options (MachineClass *m) +static void pc_i440fx_machine_9_2_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default = true; } +DEFINE_I440FX_MACHINE (9 ,2 ); + +static void pc_i440fx_machine_9_1_options (MachineClass *m) +{ +pc_i440fx_machine_9_2_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_9_1, hw_compat_9_1_len); +compat_props_add (m->compat_props, pc_compat_9_1, pc_compat_9_1_len); +} +DEFINE_I440FX_MACHINE (9 ,1 );static void pc_i440fx_machine_9_0_options (MachineClass *m)hw/i386/pc_piix.c static void pc_i440fx_machine_9_0_options(MachineClass *m) · line 507
Quoted 6 lines
hw/i386/pc_piix.c +0
-2@@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_9_1_options (m); - m->alias =NULL ; - m->is_default = false; m->smbios_memory_device_size =16 * GiB;Feels like we should be adding an "
_AS_LATEST" macro variant for piix/q35 too, so it matches the pattern in other targets for handling alias &is_default.Quoted 1 line
Not a thing your patch needs todo though.
I've just a patch that does that now. If it looks good & you want to include it as a pre-requisite for your patch here feel free to grab, otherwise I can rebase it after your patch merges.
Quoted 8 lines
Quoted 4 lines
I have this patch in my target-arm pullreq that's currently posted and pending merge, by the way.
-- PMM
Ok feel free to tack on
Reviewed-by Michael S. Tsirkin <[email protected]>
Too late, this is already in git as commit fb6051e7bb2bd.
-- PMM