hw: add compat machines for 5.1
PATCH 1/1 hw: add compat machines for 5.1
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr.
---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
--- 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
@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, }; +virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat)); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) +DEFINE_VIRT_MACHINE(5, 0)static void virt_machine_4_2_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_0[] = {}; +const size_t hw_compat_5_0_len =G_N_ELEMENTS (hw_compat_5_0); +GlobalProperty hw_compat_4_2[] = { {"virtio-blk-device" ,"queue-size" ,"128" }, {"virtio-scsi-device" ,"virtqueue_size" ,"128" },
hw/i386/pc.c +3 -0
@@ -94,6 +94,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_0[] = {}; +const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0); +GlobalProperty pc_compat_4_2[] = { {"mch" ,"smbase-smram" ,"off" }, };
hw/i386/pc_piix.c +13 -1
@@ -419,7 +419,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_RAMFB_DEVICE ); } -static void pc_i440fx_5_0_machine_options (MachineClass *m) +static void pc_i440fx_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);
@@ -428,6 +428,18 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , + pc_i440fx_5_1_machine_options); + +static void pc_i440fx_5_0_machine_options (MachineClass *m) +{ +pc_i440fx_5_1_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_I440FX_MACHINE (v5_0,"pc-i440fx-5.0" ,NULL , pc_i440fx_5_0_machine_options);
hw/i386/pc_q35.c +12 -1
@@ -349,7 +349,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_0_machine_options (MachineClass *m) +static void pc_q35_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);
@@ -357,6 +357,17 @@ static void pc_q35_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , + pc_q35_5_1_machine_options); + +static void pc_q35_5_0_machine_options (MachineClass *m) +{ +pc_q35_5_1_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_Q35_MACHINE (v5_0,"pc-q35-5.0" ,NULL , pc_q35_5_0_machine_options);
hw/ppc/spapr.c +13 -2
@@ -4599,15 +4599,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.1 +*/ +static void spapr_machine_5_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +/* * pseries-5.0 */ static void spapr_machine_5_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_SPAPR_MACHINE(5_0, "5.0", true); +DEFINE_SPAPR_MACHINE(5_0, "5.0", false);/* * pseries-4.2
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -672,14 +672,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_1, "5.1", true); +static void ccw_machine_5_0_instance_options (MachineState *machine) { +ccw_machine_5_1_instance_options (machine); }static void ccw_machine_5_0_class_options (MachineClass *mc) { +ccw_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_CCW_MACHINE(5_0, "5.0", true); +DEFINE_CCW_MACHINE(5_0, "5.0", false);static void ccw_machine_4_2_instance_options (MachineState *machine) {
include/hw/boards.h +3 -0
@@ -318,6 +318,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_0[]; +extern const size_t hw_compat_5_0_len; +extern GlobalProperty hw_compat_4_2[];extern const size_t hw_compat_4_2_len;
include/hw/i386/pc.h +3 -0
@@ -204,6 +204,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_0[]; +extern const size_t pc_compat_5_0_len; +extern GlobalProperty pc_compat_4_2[];extern const size_t pc_compat_4_2_len;
Signature · 1 line
2.21.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
TEST check-qtest-aarch64: tests/qtest/tpm-tis-device-test
Broken pipe/tmp/qemu-test/src/tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped)
ERROR - missing test plan
make: *** [check-qtest-aarch64] Error 1
make: *** Waiting for unfinished jobs....
TEST check-unit: tests/check-qnum
TEST check-unit: tests/check-qstring
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=77d5f47dd63749258053627329e12588', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-q3quhcc5/src/docker-src.2020-04-24-06.49.19.9491:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=77d5f47dd63749258053627329e12588
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-q3quhcc5/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 14m25.377s
user 0m8.597s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 3 lines · Cornelia Huck
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
Quoted 232 lines
---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
--- 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@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, }; +virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat)); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) +DEFINE_VIRT_MACHINE(5, 0)static void virt_machine_4_2_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_0[] = {}; +const size_t hw_compat_5_0_len =G_N_ELEMENTS (hw_compat_5_0); +GlobalProperty hw_compat_4_2[] = { {"virtio-blk-device" ,"queue-size" ,"128" }, {"virtio-scsi-device" ,"virtqueue_size" ,"128" },hw/i386/pc.c +3
-0@@ -94,6 +94,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_0[] = {}; +const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0); +GlobalProperty pc_compat_4_2[] = { {"mch" ,"smbase-smram" ,"off" }, };hw/i386/pc_piix.c +13
-1@@ -419,7 +419,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_RAMFB_DEVICE ); } -static void pc_i440fx_5_0_machine_options (MachineClass *m) +static void pc_i440fx_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -428,6 +428,18 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , + pc_i440fx_5_1_machine_options); + +static void pc_i440fx_5_0_machine_options (MachineClass *m) +{ +pc_i440fx_5_1_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_I440FX_MACHINE (v5_0,"pc-i440fx-5.0" ,NULL , pc_i440fx_5_0_machine_options);hw/i386/pc_q35.c +12
-1@@ -349,7 +349,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_0_machine_options (MachineClass *m) +static void pc_q35_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -357,6 +357,17 @@ static void pc_q35_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , + pc_q35_5_1_machine_options); + +static void pc_q35_5_0_machine_options (MachineClass *m) +{ +pc_q35_5_1_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_Q35_MACHINE (v5_0,"pc-q35-5.0" ,NULL , pc_q35_5_0_machine_options);hw/ppc/spapr.c +13
-2@@ -4599,15 +4599,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.1 +*/ +static void spapr_machine_5_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +/* * pseries-5.0 */ static void spapr_machine_5_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_SPAPR_MACHINE(5_0, "5.0", true); +DEFINE_SPAPR_MACHINE(5_0, "5.0", false);/* * pseries-4.2 hw/s390x/s390-virtio-ccw.c +13
-1@@ -672,14 +672,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_1, "5.1", true); +static void ccw_machine_5_0_instance_options (MachineState *machine) { +ccw_machine_5_1_instance_options (machine); }static void ccw_machine_5_0_class_options (MachineClass *mc) { +ccw_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_CCW_MACHINE(5_0, "5.0", true); +DEFINE_CCW_MACHINE(5_0, "5.0", false);static void ccw_machine_4_2_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -318,6 +318,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_0[]; +extern const size_t hw_compat_5_0_len; +extern GlobalProperty hw_compat_4_2[];extern const size_t hw_compat_4_2_len;include/hw/i386/pc.h +3
-0@@ -204,6 +204,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_0[]; +extern const size_t pc_compat_5_0_len; +extern GlobalProperty pc_compat_4_2[];extern const size_t pc_compat_4_2_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 5.1 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>
Quoted 7 lines
---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
Feel free to do so.
Quoted 226 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@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, }; +virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat)); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) +DEFINE_VIRT_MACHINE(5, 0)static void virt_machine_4_2_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_0[] = {}; +const size_t hw_compat_5_0_len =G_N_ELEMENTS (hw_compat_5_0); +GlobalProperty hw_compat_4_2[] = { {"virtio-blk-device" ,"queue-size" ,"128" }, {"virtio-scsi-device" ,"virtqueue_size" ,"128" },hw/i386/pc.c +3
-0@@ -94,6 +94,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_0[] = {}; +const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0); +GlobalProperty pc_compat_4_2[] = { {"mch" ,"smbase-smram" ,"off" }, };hw/i386/pc_piix.c +13
-1@@ -419,7 +419,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_RAMFB_DEVICE ); } -static void pc_i440fx_5_0_machine_options (MachineClass *m) +static void pc_i440fx_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -428,6 +428,18 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , + pc_i440fx_5_1_machine_options); + +static void pc_i440fx_5_0_machine_options (MachineClass *m) +{ +pc_i440fx_5_1_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_I440FX_MACHINE (v5_0,"pc-i440fx-5.0" ,NULL , pc_i440fx_5_0_machine_options);hw/i386/pc_q35.c +12
-1@@ -349,7 +349,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_0_machine_options (MachineClass *m) +static void pc_q35_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -357,6 +357,17 @@ static void pc_q35_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , + pc_q35_5_1_machine_options); + +static void pc_q35_5_0_machine_options (MachineClass *m) +{ +pc_q35_5_1_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_Q35_MACHINE (v5_0,"pc-q35-5.0" ,NULL , pc_q35_5_0_machine_options);hw/ppc/spapr.c +13
-2@@ -4599,15 +4599,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.1 +*/ +static void spapr_machine_5_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +/* * pseries-5.0 */ static void spapr_machine_5_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_SPAPR_MACHINE(5_0, "5.0", true); +DEFINE_SPAPR_MACHINE(5_0, "5.0", false);/* * pseries-4.2 hw/s390x/s390-virtio-ccw.c +13
-1@@ -672,14 +672,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_1, "5.1", true); +static void ccw_machine_5_0_instance_options (MachineState *machine) { +ccw_machine_5_1_instance_options (machine); }static void ccw_machine_5_0_class_options (MachineClass *mc) { +ccw_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_CCW_MACHINE(5_0, "5.0", true); +DEFINE_CCW_MACHINE(5_0, "5.0", false);static void ccw_machine_4_2_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -318,6 +318,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_0[]; +extern const size_t hw_compat_5_0_len; +extern GlobalProperty hw_compat_4_2[];extern const size_t hw_compat_4_2_len;include/hw/i386/pc.h +3
-0@@ -204,6 +204,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_0[]; +extern const size_t pc_compat_5_0_len; +extern GlobalProperty pc_compat_4_2[];extern const size_t pc_compat_4_2_len;Signature · 1 line
2.21.1
Hi Connie,
Quoted 35 lines · Cornelia Huck
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
--- 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 +4
-0@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST (5 ,1 )
hw/arm/virt.c static void machvirt_machine_init(void) · line 2325
Quoted 10 lines
hw/arm/virt.c +3
-0+static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, }; +virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat));
As spotted by patchew we need { TYPE_TPM_TIS_SYSBUS, "ppi", "false" } to be applied for all machine types 5_0 onwards as our tpm-tis-device does not support PPI. So I guess we need to move compat[] declaration outside of virt_machine_5_0_options and call "compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));" for each virt_machine_5_*_options? Or is a misuse of compats?
Thanks
Eric
Quoted 191 lines
hw/arm/virt.c +1
-1} -DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) +DEFINE_VIRT_MACHINE(5, 0)static void virt_machine_4_2_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_0[] = {}; +const size_t hw_compat_5_0_len =G_N_ELEMENTS (hw_compat_5_0); +GlobalProperty hw_compat_4_2[] = { {"virtio-blk-device" ,"queue-size" ,"128" }, {"virtio-scsi-device" ,"virtqueue_size" ,"128" },hw/i386/pc.c +3
-0@@ -94,6 +94,9 @@#include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_0[] = {}; +const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0); +GlobalProperty pc_compat_4_2[] = { {"mch" ,"smbase-smram" ,"off" }, };hw/i386/pc_piix.c +13
-1@@ -419,7 +419,7 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_RAMFB_DEVICE ); } -static void pc_i440fx_5_0_machine_options (MachineClass *m) +static void pc_i440fx_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m);@@ -428,6 +428,18 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_I440FX_MACHINE (v5_1,"pc-i440fx-5.1" ,NULL , + pc_i440fx_5_1_machine_options); + +static void pc_i440fx_5_0_machine_options (MachineClass *m) +{ +pc_i440fx_5_1_machine_options (m); + m->alias =NULL ; + m->is_default = false; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_I440FX_MACHINE (v5_0,"pc-i440fx-5.0" ,NULL , pc_i440fx_5_0_machine_options);hw/i386/pc_q35.c +12
-1@@ -349,7 +349,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_5_0_machine_options (MachineClass *m) +static void pc_q35_5_1_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -357,6 +357,17 @@ static void pc_q35_5_0_machine_options(MachineClass *m) pcmc->default_cpu_version =1 ; } +DEFINE_Q35_MACHINE (v5_1,"pc-q35-5.1" ,NULL , + pc_q35_5_1_machine_options); + +static void pc_q35_5_0_machine_options (MachineClass *m) +{ +pc_q35_5_1_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_5_0, hw_compat_5_0_len); +compat_props_add (m->compat_props, pc_compat_5_0, pc_compat_5_0_len); +} +DEFINE_Q35_MACHINE (v5_0,"pc-q35-5.0" ,NULL , pc_q35_5_0_machine_options);hw/ppc/spapr.c +13
-2@@ -4599,15 +4599,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-5.1 +*/ +static void spapr_machine_5_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +/* * pseries-5.0 */ static void spapr_machine_5_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_SPAPR_MACHINE(5_0, "5.0", true); +DEFINE_SPAPR_MACHINE(5_0, "5.0", false);/* * pseries-4.2 hw/s390x/s390-virtio-ccw.c +13
-1@@ -672,14 +672,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_1, "5.1", true); +static void ccw_machine_5_0_instance_options (MachineState *machine) { +ccw_machine_5_1_instance_options (machine); }static void ccw_machine_5_0_class_options (MachineClass *mc) { +ccw_machine_5_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); } -DEFINE_CCW_MACHINE(5_0, "5.0", true); +DEFINE_CCW_MACHINE(5_0, "5.0", false);static void ccw_machine_4_2_instance_options (MachineState *machine) {include/hw/boards.h +3
-0@@ -318,6 +318,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_0[]; +extern const size_t hw_compat_5_0_len; +extern GlobalProperty hw_compat_4_2[];extern const size_t hw_compat_4_2_len;include/hw/i386/pc.h +3
-0@@ -204,6 +204,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_0[]; +extern const size_t pc_compat_5_0_len; +extern GlobalProperty pc_compat_4_2[];extern const size_t pc_compat_4_2_len;
Quoted 45 lines · On Mon, 27 Apr 2020 09:43:33 +0200 Auger Eric <[email protected]> wrote:
Hi Connie,
Quoted 42 lines · Cornelia Huck
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
--- 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@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, };
Quoted 9 lines
hw/arm/virt.c static void machvirt_machine_init(void) · line 2325
Quoted 3 lines
hw/arm/virt.c +2
-0+virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat));As spotted by patchew we need {
TYPE_TPM_TIS_SYSBUS, "ppi", "false" } to be applied for all machine types 5_0 onwards as our tpm-tis-device does not support PPI. So I guess we need to move compat[] declaration outside ofvirt_machine_5_0_optionsand call "compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));" for each virt_machine_5_*_options? Or is a misuse of compats?
Ah, that was the error (I could not really make sense of it).
So, if I understand it correctly, ppi needs to be disabled for all virt machines. I think the correct way to do this would be to add the "compat" prop in virt_machine_class_init() (even if it is not strictly compat, as it always needs to be disabled). It can be removed there and added to a compat machine should support be added in the future.
Or does anyone have a better idea?
Hi Connie,
Quoted 58 lines · Cornelia Huck
Quoted 45 lines · On Mon, 27 Apr 2020 09:43:33 +0200 Auger Eric <[email protected]> wrote:
Hi Connie,
Quoted 42 lines · Cornelia Huck
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
--- 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@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, };Quoted 9 lines
hw/arm/virt.c static void machvirt_machine_init(void) · line 2325
Quoted 3 lines
hw/arm/virt.c +2
-0+virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat));As spotted by patchew we need {
TYPE_TPM_TIS_SYSBUS, "ppi", "false" } to be applied for all machine types 5_0 onwards as our tpm-tis-device does not support PPI. So I guess we need to move compat[] declaration outside ofvirt_machine_5_0_optionsand call "compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));" for each virt_machine_5_*_options? Or is a misuse of compats?
Quoted 4 lines
Ah, that was the error (I could not really make sense of it).
So, if I understand it correctly, ppi needs to be disabled for all virt machines.
ppi property of tpm-tis-sysbus device needs to be disabled for all virt machines whose version >= 5.0. tpm-tis-sysbus device is supported from 5.0 onwards.
Looking again at the code, I should rather set the default value of the ppi property to false in tpm_tis_sysbus_properties. Before we shared the same device with x86, hence the compat but now we have a separate one. I guess that should work directly without the pain of that compat :-( Let me check ...
Thanks
Eric
I think the correct way to do this would be to add the
Quoted 7 lines
"compat" prop in
virt_machine_class_init()(even if it is not strictly compat, as it always needs to be disabled). It can be removed there and added to a compat machine should support be added in the future.Or does anyone have a better idea?
Quoted 61 lines · On Mon, 27 Apr 2020 11:58:28 +0200 Auger Eric <[email protected]> wrote:
Hi Connie,
Quoted 58 lines · Cornelia Huck
Quoted 54 lines · On Mon, 27 Apr 2020 09:43:33 +0200 Auger Eric <[email protected]> wrote:
Hi Connie,
Quoted 35 lines · Cornelia Huck
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr.
Signed-off-by Cornelia Huck <[email protected]>---
Still keeping the default cpu model version on x86 at v1.
I'll queue this to my s390-next branch, as I'm planning to send a pull req as soon as 5.0 is out; if someone else wants to queue this, we'll figure it out :)
--- 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 +4
-0@@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_5_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST (5 ,1 )hw/arm/virt.c static void machvirt_machine_init(void) · line 2325
Quoted 10 lines
hw/arm/virt.c +3
-0+static void virt_machine_5_0_options (MachineClass *mc) {static GlobalProperty compat[] = { {TYPE_TPM_TIS_SYSBUS ,"ppi" ,"false" }, }; +virt_machine_5_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);compat_props_add (mc->compat_props, compat,G_N_ELEMENTS (compat));As spotted by patchew we need {
TYPE_TPM_TIS_SYSBUS, "ppi", "false" } to be applied for all machine types 5_0 onwards as our tpm-tis-device does not support PPI. So I guess we need to move compat[] declaration outside ofvirt_machine_5_0_optionsand call "compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));" for each virt_machine_5_*_options? Or is a misuse of compats?
Quoted 7 lines
Quoted 4 lines
Ah, that was the error (I could not really make sense of it).
So, if I understand it correctly, ppi needs to be disabled for all virt machines.
ppi property of tpm-tis-sysbus device needs to be disabled for all virt machines whose version >= 5.0. tpm-tis-sysbus device is supported from 5.0 onwards.
It would probably be ok to set for all versions; if the device is not available, a compat entry should not hurt.
Quoted 6 lines
Looking again at the code, I should rather set the default value of the ppi property to false in
tpm_tis_sysbus_properties. Before we shared the same device with x86, hence the compat but now we have a separate one. I guess that should work directly without the pain of that compat :-( Let me check ...
Yes, that seems like a better solution.
Quoted 12 lines
Thanks
Eric
I think the correct way to do this would be to add theQuoted 7 lines
"compat" prop in
virt_machine_class_init()(even if it is not strictly compat, as it always needs to be disabled). It can be removed there and added to a compat machine should support be added in the future.Or does anyone have a better idea?