Add QEMU_CAPS_MACHINE_S390_BOOT_CERTS to detect whether QEMU supports -machine s390-ccw-virtio,boot-certs.N.path=/path/to/cert. Update the s390x QMP reply test fixtures for QEMU 8.1 through 11.2 to include the new qom-list-properties probe for the s390-ccw-virtio machine type and renumber subsequent message IDs. Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com> --- src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + .../caps_10.0.0_s390x.replies | 145 +++++++++++++- .../caps_10.1.0_s390x.replies | 150 ++++++++++++++- .../caps_11.0.0_s390x.replies | 156 ++++++++++++++- .../caps_11.1.0_s390x.replies | 156 ++++++++++++++- .../caps_11.2.0_s390x.replies | 181 +++++++++++++++++- .../caps_11.2.0_s390x.xml | 1 + .../caps_8.1.0_s390x.replies | 135 ++++++++++++- .../caps_8.2.0_s390x.replies | 135 ++++++++++++- .../caps_9.1.0_s390x.replies | 139 +++++++++++++- .../caps_9.2.0_s390x.replies | 144 +++++++++++++- 12 files changed, 1274 insertions(+), 77 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bc2b0412dc..48a6bbbd6d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -776,6 +776,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "arm-smmuv3.cmdqv", /* QEMU_CAPS_ARM_SMMUV3_CMDQV */ "iothread.poll-weight", /* QEMU_CAPS_IOTHREAD_POLL_WEIGHT */ "win-dmp.guest-aware", /* QEMU_CAPS_WIN_DMP_GUEST_AWARE */ + "machine.s390-ccw-virtio.boot-certs", /* QEMU_CAPS_MACHINE_S390_BOOT_CERTS */ ); @@ -1883,6 +1884,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] = { { "highmem-mmio-size", QEMU_CAPS_MACHINE_VIRT_HIGHMEM_MMIO_SIZE }, }; +static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsS390[] = { + { "boot-certs", QEMU_CAPS_MACHINE_S390_BOOT_CERTS }, +}; + static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] = { { "confidential-guest-support", QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT }, { "shim", QEMU_CAPS_MACHINE_SHIM }, @@ -1899,6 +1904,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsMachineProps[] = { { "virt", virQEMUCapsMachinePropsVirt, G_N_ELEMENTS(virQEMUCapsMachinePropsVirt), -1 }, + { "s390-ccw-virtio", virQEMUCapsMachinePropsS390, + G_N_ELEMENTS(virQEMUCapsMachinePropsS390), + -1 }, { "none", virQEMUCapsMachinePropsGeneric, G_N_ELEMENTS(virQEMUCapsMachinePropsGeneric), -1 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 28303fd8f0..880ed29281 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -750,6 +750,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_ARM_SMMUV3_CMDQV, /* arm-smmuv3.cmdqv */ QEMU_CAPS_IOTHREAD_POLL_WEIGHT, /* -object iothread.poll-weight */ QEMU_CAPS_WIN_DMP_GUEST_AWARE, /* 'win-dmp' is offered only to a guest that can use it */ + QEMU_CAPS_MACHINE_S390_BOOT_CERTS, /* -machine s390-ccw-virtio,boot-certs.N.path= */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies index ecd9af85ce..3ae3a10359 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies @@ -31030,7 +31030,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-10.0-machine" }, "id": "libvirt-38" } @@ -31155,10 +31155,137 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, + "id": "libvirt-39" +} + +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "aux-ram-share", + "type": "bool" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "shim", + "description": "shim.efi file", + "type": "string" + }, + { + "name": "smp-cache", + "description": "Cache properties list for SMP machine", + "type": "SmpCachePropertiesWrapper" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + } + ], "id": "libvirt-39" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-40" +} + { "return": [ { @@ -31866,12 +31993,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -33149,7 +33276,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -33160,7 +33287,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -33232,7 +33359,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -33243,7 +33370,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -33399,7 +33526,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.replies index 07d06fd029..926b3e2000 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.replies @@ -31913,7 +31913,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-10.1-machine" }, "id": "libvirt-38" } @@ -32043,10 +32043,142 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, "id": "libvirt-39" } +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "aux-ram-share", + "type": "bool" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "shim", + "description": "shim.efi file", + "type": "string" + }, + { + "name": "smp-cache", + "description": "Cache properties list for SMP machine", + "type": "SmpCachePropertiesWrapper" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "spcr", + "description": "Set on/off to enable/disable ACPI Serial Port Console Redirection Table (spcr)", + "type": "bool" + } + ], + "id": "libvirt-39" +} + +{ + "execute": "query-cpu-definitions", + "id": "libvirt-40" +} + { "return": [ { @@ -32782,12 +32914,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34065,7 +34197,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34076,7 +34208,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34157,7 +34289,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34168,7 +34300,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -34324,7 +34456,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_11.0.0_s390x.replies index 710df18515..73bce43e51 100644 --- a/tests/qemucapabilitiesdata/caps_11.0.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_11.0.0_s390x.replies @@ -32153,7 +32153,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-11.0-machine" }, "id": "libvirt-38" } @@ -32289,10 +32289,148 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, "id": "libvirt-39" } +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "x-change-vmfd-on-reset", + "description": "Set on/off to enable/disable generating new accelerator guest handle on guest reset. Default: off (used only for testing/debugging).", + "type": "bool" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "aux-ram-share", + "description": "Use anonymous shared memory for auxiliary guest RAMs", + "type": "bool" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "shim", + "description": "shim.efi file", + "type": "string" + }, + { + "name": "smp-cache", + "description": "Cache properties list for SMP machine", + "type": "SmpCachePropertiesWrapper" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "spcr", + "description": "Set on/off to enable/disable ACPI Serial Port Console Redirection Table (spcr)", + "type": "bool" + } + ], + "id": "libvirt-39" +} + +{ + "execute": "query-cpu-definitions", + "id": "libvirt-40" +} + { "return": [ { @@ -33028,12 +33166,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34321,7 +34459,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34332,7 +34470,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34413,7 +34551,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34424,7 +34562,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -34580,7 +34718,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_11.1.0_s390x.replies index 6ec196e3e6..eb7bda68a1 100644 --- a/tests/qemucapabilitiesdata/caps_11.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_11.1.0_s390x.replies @@ -32360,7 +32360,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-11.1-machine" }, "id": "libvirt-38" } @@ -32496,10 +32496,148 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, "id": "libvirt-39" } +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "x-change-vmfd-on-reset", + "description": "Set on/off to enable/disable generating new accelerator guest handle on guest reset. Default: off (used only for testing/debugging).", + "type": "bool" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "aux-ram-share", + "description": "Use anonymous shared memory for auxiliary guest RAMs", + "type": "bool" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "shim", + "description": "shim.efi file", + "type": "string" + }, + { + "name": "smp-cache", + "description": "Cache properties list for SMP machine", + "type": "SmpCachePropertiesWrapper" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "spcr", + "description": "Set on/off to enable/disable ACPI Serial Port Console Redirection Table (spcr)", + "type": "bool" + } + ], + "id": "libvirt-39" +} + +{ + "execute": "query-cpu-definitions", + "id": "libvirt-40" +} + { "return": [ { @@ -33235,12 +33373,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34540,7 +34678,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34551,7 +34689,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34641,7 +34779,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34652,7 +34790,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -34809,7 +34947,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_11.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_11.2.0_s390x.replies index fcc26052df..2aa64ba4ea 100644 --- a/tests/qemucapabilitiesdata/caps_11.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_11.2.0_s390x.replies @@ -32672,7 +32672,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-11.2-machine" }, "id": "libvirt-38" } @@ -32798,6 +32798,31 @@ "description": "Overrides the \"compatible\" property of the dt root node", "type": "string" }, + { + "name": "loadparm", + "description": "Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars converted to upper case) to pass to machine loader, boot manager, and guest kernel", + "type": "loadparm" + }, + { + "name": "aes-key-wrap", + "description": "enable/disable AES key wrapping using the CPACF wrapping key", + "type": "bool" + }, + { + "name": "dea-key-wrap", + "description": "enable/disable DEA key wrapping using the CPACF wrapping key", + "type": "bool" + }, + { + "name": "boot-certs", + "description": "provide paths to a directory and/or a certificate file for secure boot", + "type": "BootCertificatesList" + }, + { + "name": "secure-boot", + "description": "enable/disable secure boot", + "type": "bool" + }, { "name": "spcr", "description": "Set on/off to enable/disable ACPI Serial Port Console Redirection Table (spcr)", @@ -32808,10 +32833,148 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, "id": "libvirt-39" } +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "x-change-vmfd-on-reset", + "description": "Set on/off to enable/disable generating new accelerator guest handle on guest reset. Default: off (used only for testing/debugging).", + "type": "bool" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "aux-ram-share", + "description": "Use anonymous shared memory for auxiliary guest RAMs", + "type": "bool" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "shim", + "description": "shim.efi file", + "type": "string" + }, + { + "name": "smp-cache", + "description": "Cache properties list for SMP machine", + "type": "SmpCachePropertiesWrapper" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "spcr", + "description": "Set on/off to enable/disable ACPI Serial Port Console Redirection Table (spcr)", + "type": "bool" + } + ], + "id": "libvirt-39" +} + +{ + "execute": "query-cpu-definitions", + "id": "libvirt-40" +} + { "return": [ { @@ -33547,12 +33710,12 @@ "deprecated": false } ], - "id": "libvirt-39" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34862,7 +35025,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -34873,7 +35036,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34957,7 +35120,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -34968,7 +35131,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -35128,7 +35291,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml index b1e839eed4..7a7f0beaf5 100644 --- a/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml @@ -149,6 +149,7 @@ <flag name='object-monitor-qmp'/> <flag name='iothread.poll-weight'/> <flag name='win-dmp.guest-aware'/> + <flag name='machine.s390-ccw-virtio.boot-certs'/> <version>11001050</version> <microcodeVersion>39100288</microcodeVersion> <package>v11.1.0-1870-g81ce3a8773</package> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies index 6bd4f80dc2..dc1d36439c 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies @@ -28300,7 +28300,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-8.1-machine" }, "id": "libvirt-35" } @@ -28419,10 +28419,131 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, + "id": "libvirt-36" +} + +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "peripheral-anon", + "type": "child<container>" + }, + { + "name": "peripheral", + "type": "child<container>" + } + ], "id": "libvirt-36" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-37" +} + { "return": [ { @@ -29184,12 +29305,12 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -30412,7 +30533,7 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -30423,7 +30544,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -30472,7 +30593,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies index 4ee07edb25..e3405decd5 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies @@ -29008,7 +29008,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-8.2-machine" }, "id": "libvirt-35" } @@ -29127,10 +29127,131 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, + "id": "libvirt-36" +} + +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "peripheral-anon", + "type": "child<container>" + }, + { + "name": "peripheral", + "type": "child<container>" + } + ], "id": "libvirt-36" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-37" +} + { "return": [ { @@ -29892,12 +30013,12 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -31128,7 +31249,7 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -31139,7 +31260,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -31188,7 +31309,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies index 4ea1a6a6f7..d7c7c70727 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -30077,7 +30077,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-9.1-machine" }, "id": "libvirt-36" } @@ -30196,10 +30196,131 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, + "id": "libvirt-37" +} + +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "peripheral-anon", + "type": "child<container>" + }, + { + "name": "peripheral", + "type": "child<container>" + } + ], "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -30835,12 +30956,12 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -32079,7 +32200,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -32090,7 +32211,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -32162,7 +32283,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -32173,7 +32294,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -32245,7 +32366,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies index 78a59cf3e5..9c2488b2e4 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies @@ -30297,7 +30297,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "none-machine" + "typename": "s390-ccw-virtio-9.2-machine" }, "id": "libvirt-36" } @@ -30421,10 +30421,136 @@ } { - "execute": "query-cpu-definitions", + "execute": "qom-list-properties", + "arguments": { + "typename": "none-machine" + }, "id": "libvirt-37" } +{ + "return": [ + { + "name": "type", + "type": "string" + }, + { + "name": "kernel", + "description": "Linux kernel image file", + "type": "string" + }, + { + "name": "dt-compatible", + "description": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "suppress-vmdesc", + "description": "Set on to disable self-describing migration", + "type": "bool" + }, + { + "name": "boot", + "description": "Boot configuration", + "type": "BootConfiguration" + }, + { + "name": "memory", + "description": "Memory size configuration", + "type": "MemorySizeConfiguration" + }, + { + "name": "initrd", + "description": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "confidential-guest-support", + "description": "Set confidential guest scheme to support", + "type": "link<confidential-guest-support>" + }, + { + "name": "graphics", + "description": "Set on/off to enable/disable graphics emulation", + "type": "bool" + }, + { + "name": "usb", + "description": "Set on/off to enable/disable usb", + "type": "bool" + }, + { + "name": "firmware", + "description": "Firmware image", + "type": "string" + }, + { + "name": "memory-encryption", + "description": "Set memory encryption object to use", + "type": "string" + }, + { + "name": "smp", + "description": "CPU topology", + "type": "SMPConfiguration" + }, + { + "name": "dump-guest-core", + "description": "Include guest memory in a core dump", + "type": "bool" + }, + { + "name": "smp-cache", + "description": "Cache properties list for SMP machine", + "type": "SmpCachePropertiesWrapper" + }, + { + "name": "dumpdtb", + "description": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "phandle-start", + "description": "The first phandle ID we may generate dynamically", + "type": "int" + }, + { + "name": "memory-backend", + "description": "Set RAM backendValid value is ID of hostmem based backend", + "type": "link<memory-backend>" + }, + { + "name": "mem-merge", + "description": "Enable/disable memory merge support", + "type": "bool" + }, + { + "name": "dtb", + "description": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "description": "Linux kernel command line", + "type": "string" + }, + { + "name": "peripheral-anon", + "type": "child<container>" + }, + { + "name": "peripheral", + "type": "child<container>" + } + ], + "id": "libvirt-37" +} + +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -31060,12 +31186,12 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -32313,7 +32439,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -32324,7 +32450,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -32396,7 +32522,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -32407,7 +32533,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -32548,7 +32674,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-41" } { -- 2.56.0