[PATCH 00/22] Fix hotplug of disks with iothreads and s390 cruft cleanup
This series consists of 3 parts: Part 1, patches 1-3: These are fixes to the virCommand->string conversion, namely two bugs: - VIR_TEST_REGENERATE_OUTPUT would produce new files with missing end newline - memleak in bhyves xml->native conversion Part 2, patches 4 - 21: Removal of 's390-virtio' machine and the corresponding addressing type. This was removed in qemu 2.6. The exploration started because the last patch was for a strange reason checking the address type and I needed to know if indeed 'virtio-s390' addresses don't support iothreads. Turns out the whole thing can be deleted. Part 3, patch 22: Hotplug of disks with iothreads is broken because the code was moved prior to address asignment and didn't account for missing address. Let's remove the whole check as it turned out to be pointless. Peter Krempa (22): util: command: Introduce virCommandToStringBuf qemuxml2arvtest: Ensure newline at the end of generated .args files bhyveConnectDomainXMLToNative: Fix memory leak in incorrect virCommandToString usage tests: qemuxml2argv: Modernize 'watchdog-diag288' test tests: qemuxml2argv: Modernize 'console-sclp' test tests: qemuxml2argv: Remove redundant tests for the obsolete 'virtio-390' machine tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-none' test tests: qemuxml2xml: Modernize 's390-defaultconsole' case tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-controller' test qemu: domain: Remove hack for 's390-virtio' machine tests: Remove 's390-virtio' machine caps faking qemu: capabilities: Remove probing of 'virtio-*-s390' devices qemu: capabilities: Don't probe device properties for 'virtio-*-s390' devices qemuxml2argvtest: Use other bus capability for 'non-x86_64-timer-error' case qemu: Always reject 'virtio-s390' addresses qemu: Remove last uses of QEMU_CAPS_VIRTIO_S390 qemuxml2*test: Remove QEMU_CAPS_VIRTIO_S390 flag qemu: capabilities: Retire QEMU_CAPS_VIRTIO_S390 qemu: Drop handling of devices with VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 qemuValidateDomainDeviceDefAddress: Add validation of CCW address qemuDomainCheckCCWS390AddressSupport: Remove duplicated checker qemu: validate: Don't check bus type in qemuValidateDomainDeviceDefDiskIOThreads src/bhyve/bhyve_driver.c | 4 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 10 -- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 44 ----- src/qemu/qemu_domain.h | 6 - src/qemu/qemu_domain_address.c | 17 +- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_hotplug.c | 17 +- src/qemu/qemu_validate.c | 48 ++--- src/util/vircommand.c | 50 ++++-- src/util/vircommand.h | 4 + .../caps_2.11.0.s390x.replies | 108 +++++------ .../caps_2.11.0.x86_64.replies | 152 +++++++--------- .../caps_2.12.0.aarch64.replies | 132 ++++++-------- .../caps_2.12.0.ppc64.replies | 124 ++++++------- .../caps_2.12.0.s390x.replies | 116 ++++++------ .../caps_2.12.0.x86_64.replies | 168 ++++++++---------- .../caps_3.0.0.ppc64.replies | 124 ++++++------- .../caps_3.0.0.riscv32.replies | 100 +++++------ .../caps_3.0.0.riscv64.replies | 100 +++++------ .../caps_3.0.0.s390x.replies | 120 ++++++------- .../caps_3.0.0.x86_64.replies | 168 ++++++++---------- .../caps_3.1.0.ppc64.replies | 124 ++++++------- .../caps_3.1.0.x86_64.replies | 168 ++++++++---------- .../caps_4.0.0.aarch64.replies | 136 +++++++------- .../caps_4.0.0.ppc64.replies | 132 ++++++-------- .../caps_4.0.0.riscv32.replies | 128 ++++++------- .../caps_4.0.0.riscv64.replies | 128 ++++++------- .../caps_4.0.0.s390x.replies | 120 ++++++------- .../caps_4.0.0.x86_64.replies | 168 ++++++++---------- .../caps_4.1.0.x86_64.replies | 160 ++++++++--------- .../caps_4.2.0.aarch64.replies | 144 +++++++-------- .../caps_4.2.0.ppc64.replies | 132 ++++++-------- .../caps_4.2.0.s390x.replies | 124 ++++++------- .../caps_4.2.0.x86_64.replies | 164 ++++++++--------- .../caps_5.0.0.aarch64.replies | 144 +++++++-------- .../caps_5.0.0.ppc64.replies | 140 +++++++-------- .../caps_5.0.0.riscv64.replies | 132 ++++++-------- .../caps_5.0.0.x86_64.replies | 164 ++++++++--------- .../caps_5.1.0.x86_64.replies | 164 ++++++++--------- .../caps_5.2.0.aarch64.replies | 148 +++++++-------- .../caps_5.2.0.ppc64.replies | 140 +++++++-------- .../caps_5.2.0.riscv64.replies | 132 ++++++-------- .../caps_5.2.0.s390x.replies | 124 ++++++------- .../caps_5.2.0.x86_64.replies | 164 ++++++++--------- .../caps_6.0.0.s390x.replies | 124 ++++++------- .../caps_6.0.0.x86_64.replies | 164 ++++++++--------- .../caps_6.1.0.x86_64.replies | 164 ++++++++--------- tests/qemuxml2argvdata/console-sclp.args | 28 --- .../console-sclp.s390x-latest.args | 36 ++++ tests/qemuxml2argvdata/console-sclp.xml | 2 +- .../qemuxml2argvdata/console-virtio-s390.args | 29 --- .../qemuxml2argvdata/console-virtio-s390.xml | 24 --- tests/qemuxml2argvdata/disk-virtio-s390.args | 26 --- tests/qemuxml2argvdata/disk-virtio-s390.xml | 22 --- tests/qemuxml2argvdata/net-virtio-s390.args | 26 --- tests/qemuxml2argvdata/net-virtio-s390.xml | 22 --- .../s390-allow-bogus-usb-controller.args | 31 ---- ...low-bogus-usb-controller.s390x-latest.args | 39 ++++ .../s390-allow-bogus-usb-controller.xml | 2 +- .../s390-allow-bogus-usb-none.args | 31 ---- ...390-allow-bogus-usb-none.s390x-latest.args | 39 ++++ .../s390-allow-bogus-usb-none.xml | 2 +- .../qemuxml2argvdata/s390-defaultconsole.xml | 2 +- tests/qemuxml2argvdata/watchdog-diag288.args | 28 --- .../watchdog-diag288.s390x-latest.args | 36 ++++ tests/qemuxml2argvdata/watchdog-diag288.xml | 2 +- tests/qemuxml2argvtest.c | 125 +++++-------- ...l => s390-defaultconsole.s390x-latest.xml} | 4 +- tests/qemuxml2xmltest.c | 27 +-- tests/testutilsqemu.c | 2 +- tests/vircapstest.c | 4 - 74 files changed, 2562 insertions(+), 3387 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-sclp.args create mode 100644 tests/qemuxml2argvdata/console-sclp.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog-diag288.args create mode 100644 tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args rename tests/qemuxml2xmloutdata/{s390-defaultconsole.xml => s390-defaultconsole.s390x-latest.xml} (82%) -- 2.31.1
The new version allows passing a virBuffer to format the string into. This will be helpful in solving a memory lean in wrong usage of virCommandToString and also in tests where we need to add a newline after the command in certain cases. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/libvirt_private.syms | 1 + src/util/vircommand.c | 50 +++++++++++++++++++++++++--------------- src/util/vircommand.h | 4 ++++ 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0ced2a7990..9700e14def 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2037,6 +2037,7 @@ virCommandSetUID; virCommandSetUmask; virCommandSetWorkingDirectory; virCommandToString; +virCommandToStringBuf; virCommandToStringFull; virCommandWait; virCommandWriteArgLog; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6e01e4cb62..8e372c3152 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2053,8 +2053,9 @@ virCommandWriteArgLog(virCommand *cmd, int logfd) /** - * virCommandToStringFull: + * virCommandToStringBuf: * @cmd: the command to convert + * @buf: buffer to format @cmd into * @linebreaks: true to break line after each env var or option * @stripCommandPath: strip the path leading to the binary of @cmd * @@ -2062,16 +2063,15 @@ virCommandWriteArgLog(virCommand *cmd, int logfd) * before Run/RunAsync, to return a string representation of the * environment and arguments of cmd, suitably quoted for pasting into * a shell. If virCommandRun cannot succeed (because of an - * out-of-memory condition while building cmd), NULL will be returned. - * Caller is responsible for freeing the resulting string. + * out-of-memory condition while building cmd), -1 will be returned. */ -char * -virCommandToStringFull(virCommand *cmd, - bool linebreaks, - bool stripCommandPath) +int +virCommandToStringBuf(virCommand *cmd, + virBuffer *buf, + bool linebreaks, + bool stripCommandPath) { size_t i; - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *command = cmd->args[0]; g_autofree char *basename = NULL; bool had_option = false; @@ -2080,7 +2080,7 @@ virCommandToStringFull(virCommand *cmd, * now. If virCommandRun is called, it will report the same error. */ if (virCommandHasError(cmd)) { virCommandRaiseError(cmd); - return NULL; + return -1; } for (i = 0; i < cmd->nenv; i++) { @@ -2091,22 +2091,22 @@ virCommandToStringFull(virCommand *cmd, if (!eq) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid use of command API")); - return NULL; + return -1; } eq++; - virBufferAdd(&buf, cmd->env[i], eq - cmd->env[i]); - virBufferEscapeShell(&buf, eq); - virBufferAddChar(&buf, ' '); + virBufferAdd(buf, cmd->env[i], eq - cmd->env[i]); + virBufferEscapeShell(buf, eq); + virBufferAddChar(buf, ' '); if (linebreaks) - virBufferAddLit(&buf, "\\\n"); + virBufferAddLit(buf, "\\\n"); } if (stripCommandPath) command = basename = g_path_get_basename(command); - virBufferEscapeShell(&buf, command); + virBufferEscapeShell(buf, command); for (i = 1; i < cmd->nargs; i++) { - virBufferAddChar(&buf, ' '); + virBufferAddChar(buf, ' '); if (linebreaks) { /* we don't want a linebreak only if @@ -2131,11 +2131,25 @@ virCommandToStringFull(virCommand *cmd, } if (linebreak) - virBufferAddLit(&buf, "\\\n"); + virBufferAddLit(buf, "\\\n"); } - virBufferEscapeShell(&buf, cmd->args[i]); + virBufferEscapeShell(buf, cmd->args[i]); } + return 0; +} + + +char * +virCommandToStringFull(virCommand *cmd, + bool linebreaks, + bool stripCommandPath) +{ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + + if (virCommandToStringBuf(cmd, &buf, linebreaks, stripCommandPath)) + return NULL; + return virBufferContentAndReset(&buf); } diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 77cf8c8ec9..fb6c3b5d12 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -173,6 +173,10 @@ char *virCommandToString(virCommand *cmd, bool linebreaks) G_GNUC_WARN_UNUSED_RE char *virCommandToStringFull(virCommand *cmd, bool linebreaks, bool stripCommandPath); +int virCommandToStringBuf(virCommand *cmd, + virBuffer *buf, + bool linebreaks, + bool stripCommandPath); int virCommandGetArgList(virCommand *cmd, char ***args, size_t *nargs); -- 2.31.1
On 6/11/21 4:48 PM, Peter Krempa wrote:
The new version allows passing a virBuffer to format the string into. This will be helpful in solving a memory lean in wrong usage of
*leak Jano
virCommandToString and also in tests where we need to add a newline after the command in certain cases.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/libvirt_private.syms | 1 + src/util/vircommand.c | 50 +++++++++++++++++++++++++--------------- src/util/vircommand.h | 4 ++++ 3 files changed, 37 insertions(+), 18 deletions(-)
The switch to internal linebreaking of arguments caused a problem when generating .args files with VIR_TEST_REGENERATE_OUTPUT as the last argument isn't terminated with a newline. Switch to using virCommandToStringBuf and append a newline. Fixes: 0046e0b1c26c8e0167de4a35be2902b9327b0c51 Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f9ec81eb8e..357098f819 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -634,6 +634,7 @@ testCompareXMLToArgv(const void *data) { struct testQemuInfo *info = (void *) data; g_autofree char *migrateURI = NULL; + g_auto(virBuffer) actualBuf = VIR_BUFFER_INITIALIZER; g_autofree char *actualargv = NULL; unsigned int flags = info->flags; unsigned int parseFlags = info->parseFlags; @@ -788,9 +789,12 @@ testCompareXMLToArgv(const void *data) if (testCompareXMLToArgvValidateSchema(&driver, migrateURI, info, flags) < 0) goto cleanup; - if (!(actualargv = virCommandToString(cmd, true))) + if (virCommandToStringBuf(cmd, &actualBuf, true, false) < 0) goto cleanup; + virBufferAddLit(&actualBuf, "\n"); + actualargv = virBufferContentAndReset(&actualBuf); + if (virTestCompareToFileFull(actualargv, info->outfile, false) < 0) goto cleanup; -- 2.31.1
virCommandToString returns an allocated buffer, so using it directly as argument of virBufferAdd which doesn't consume the string causes it to be leaked. Switch to virBufferToStringBuf since we are already using a buffer. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/bhyve/bhyve_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 0fddf9533b..fc696a50a7 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -723,14 +723,14 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, "<device.map>", NULL))) goto cleanup; - virBufferAdd(&buf, virCommandToString(loadcmd, false), -1); + virBufferToStringBuf(loadcmd, &buf, false, false); virBufferAddChar(&buf, '\n'); } if (!(cmd = virBhyveProcessBuildBhyveCmd(privconn, def, true))) goto cleanup; - virBufferAdd(&buf, virCommandToString(cmd, false), -1); + virBufferToStringBuf(cmd, &buf, false, false); ret = virBufferContentAndReset(&buf); -- 2.31.1
The 's390-virtio' machine was removed from qemu in the 2.6 release. Modernize the test for diag288 since there isn't any other test for it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/watchdog-diag288.args | 28 --------------- .../watchdog-diag288.s390x-latest.args | 36 +++++++++++++++++++ tests/qemuxml2argvdata/watchdog-diag288.xml | 2 +- tests/qemuxml2argvtest.c | 2 +- 4 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 tests/qemuxml2argvdata/watchdog-diag288.args create mode 100644 tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args deleted file mode 100644 index e070f26e25..0000000000 --- a/tests/qemuxml2argvdata/watchdog-diag288.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --device diag288,id=watchdog0 \ --watchdog-action inject-nmi diff --git a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args b/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args new file mode 100644 index 0000000000..b6ed866918 --- /dev/null +++ b/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-device diag288,id=watchdog0 \ +-watchdog-action inject-nmi \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/watchdog-diag288.xml b/tests/qemuxml2argvdata/watchdog-diag288.xml index d9935260ee..ec89cdd196 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.xml +++ b/tests/qemuxml2argvdata/watchdog-diag288.xml @@ -4,7 +4,7 @@ <memory>219100</memory> <currentMemory>219100</currentMemory> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 357098f819..82e549e219 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1905,7 +1905,7 @@ mymain(void) DO_TEST("watchdog-device", NONE); DO_TEST("watchdog-dump", NONE); DO_TEST("watchdog-injectnmi", NONE); - DO_TEST("watchdog-diag288", QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_ARCH_LATEST("watchdog-diag288", "s390x"); DO_TEST("balloon-device", NONE); DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); -- 2.31.1
The 's390-virtio' machine was removed from qemu in the 2.6 release. Modernize the test for sclp console since there isn't any other test for it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/console-sclp.args | 28 --------------- .../console-sclp.s390x-latest.args | 36 +++++++++++++++++++ tests/qemuxml2argvdata/console-sclp.xml | 2 +- tests/qemuxml2argvtest.c | 4 +-- 4 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-sclp.args create mode 100644 tests/qemuxml2argvdata/console-sclp.s390x-latest.args diff --git a/tests/qemuxml2argvdata/console-sclp.args b/tests/qemuxml2argvdata/console-sclp.args deleted file mode 100644 index 8a11a31ec6..0000000000 --- a/tests/qemuxml2argvdata/console-sclp.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device sclpconsole,chardev=charconsole0,id=console0 diff --git a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args b/tests/qemuxml2argvdata/console-sclp.s390x-latest.args new file mode 100644 index 0000000000..7dca2191c5 --- /dev/null +++ b/tests/qemuxml2argvdata/console-sclp.s390x-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-chardev pty,id=charconsole0 \ +-device sclpconsole,chardev=charconsole0,id=console0 \ +-audiodev id=audio1,driver=none \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/console-sclp.xml b/tests/qemuxml2argvdata/console-sclp.xml index 5a41772909..42fcce671a 100644 --- a/tests/qemuxml2argvdata/console-sclp.xml +++ b/tests/qemuxml2argvdata/console-sclp.xml @@ -4,7 +4,7 @@ <memory>219100</memory> <currentMemory>219100</currentMemory> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 82e549e219..2da4f9f37e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1762,9 +1762,7 @@ mymain(void) QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST_CAPS_LATEST("console-virtio-unix"); - DO_TEST("console-sclp", - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x"); DO_TEST("channel-spicevmc", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); -- 2.31.1
Remove the console, disk, and network test for the legacy s390 machine which was removed in qemu 2.6. All of these have 'ccw' equivalents. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../qemuxml2argvdata/console-virtio-s390.args | 29 ------------------- .../qemuxml2argvdata/console-virtio-s390.xml | 24 --------------- tests/qemuxml2argvdata/disk-virtio-s390.args | 26 ----------------- tests/qemuxml2argvdata/disk-virtio-s390.xml | 22 -------------- tests/qemuxml2argvdata/net-virtio-s390.args | 26 ----------------- tests/qemuxml2argvdata/net-virtio-s390.xml | 22 -------------- tests/qemuxml2argvtest.c | 6 ---- 7 files changed, 155 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.xml diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args b/tests/qemuxml2argvdata/console-virtio-s390.args deleted file mode 100644 index 60064ced2d..0000000000 --- a/tests/qemuxml2argvdata/console-virtio-s390.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 diff --git a/tests/qemuxml2argvdata/console-virtio-s390.xml b/tests/qemuxml2argvdata/console-virtio-s390.xml deleted file mode 100644 index 2150e79829..0000000000 --- a/tests/qemuxml2argvdata/console-virtio-s390.xml +++ /dev/null @@ -1,24 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> - <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - <boot order='1'/> - </disk> - <console type='pty'> - <target type='virtio'/> - </console> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args b/tests/qemuxml2argvdata/disk-virtio-s390.args deleted file mode 100644 index a2ebc87f9c..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-s390.args +++ /dev/null @@ -1,26 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.xml b/tests/qemuxml2argvdata/disk-virtio-s390.xml deleted file mode 100644 index c186f60223..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-s390.xml +++ /dev/null @@ -1,22 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - </disk> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args b/tests/qemuxml2argvdata/net-virtio-s390.args deleted file mode 100644 index e7a688081a..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-s390.args +++ /dev/null @@ -1,26 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --netdev user,id=hostnet0 \ --device virtio-net-s390,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55 diff --git a/tests/qemuxml2argvdata/net-virtio-s390.xml b/tests/qemuxml2argvdata/net-virtio-s390.xml deleted file mode 100644 index 0a390bfa0e..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-s390.xml +++ /dev/null @@ -1,22 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <interface type='user'> - <mac address='00:11:22:33:44:55'/> - <model type='virtio'/> - </interface> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2da4f9f37e..daf702cab6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1336,8 +1336,6 @@ mymain(void) DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("disk-floppy-tray", NONE); - DO_TEST("disk-virtio-s390", - QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-virtio", NONE); DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); @@ -1634,8 +1632,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-disable-offloads", NONE); DO_TEST("net-virtio-netdev", NONE); - DO_TEST("net-virtio-s390", - QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-rxtxqueuesize", @@ -1756,8 +1752,6 @@ mymain(void) DO_TEST("console-virtio", NONE); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-virtio-s390", - QEMU_CAPS_VIRTIO_S390); DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); -- 2.31.1
The 's390-virtio' machine was removed from qemu in the 2.6 release. Use the more modern s390-ccw-virtio machine type and use VIR_TEST_CAPS_ARCH_LATEST to invoke it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../s390-allow-bogus-usb-none.args | 31 --------------- ...390-allow-bogus-usb-none.s390x-latest.args | 39 +++++++++++++++++++ .../s390-allow-bogus-usb-none.xml | 2 +- tests/qemuxml2argvtest.c | 5 +-- 4 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args deleted file mode 100644 index fd698eaa46..0000000000 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name test \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 \ --object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-s390,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args new file mode 100644 index 0000000000..527141d70a --- /dev/null +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=test,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 \ +-audiodev id=audio1,driver=none \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0002 \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \ +-device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0003 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml index 8429939563..c0b2da6569 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml @@ -4,7 +4,7 @@ <memory>219100</memory> <currentMemory>219100</currentMemory> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index daf702cab6..d4b6cb680c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2540,10 +2540,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("s390-allow-bogus-usb-none", - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST("s390-allow-bogus-usb-controller", QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, -- 2.31.1
Don't use the 's390-virtio' machine which was removed in qemu 2.6 and use real capabilities for the test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/s390-defaultconsole.xml | 2 +- ...efaultconsole.xml => s390-defaultconsole.s390x-latest.xml} | 4 +++- tests/qemuxml2xmltest.c | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) rename tests/qemuxml2xmloutdata/{s390-defaultconsole.xml => s390-defaultconsole.s390x-latest.xml} (82%) diff --git a/tests/qemuxml2argvdata/s390-defaultconsole.xml b/tests/qemuxml2argvdata/s390-defaultconsole.xml index b85509ba54..0c64e83983 100644 --- a/tests/qemuxml2argvdata/s390-defaultconsole.xml +++ b/tests/qemuxml2argvdata/s390-defaultconsole.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> diff --git a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml b/tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml similarity index 82% rename from tests/qemuxml2xmloutdata/s390-defaultconsole.xml rename to tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml index d34299116c..212b294291 100644 --- a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml +++ b/tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml @@ -5,15 +5,17 @@ <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='host-model' check='partial'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index dd039bd846..664cfbd3ba 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1051,8 +1051,7 @@ mymain(void) QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_AP); - DO_TEST("s390-defaultconsole", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); DO_TEST("s390-panic", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("s390-panic-missing", -- 2.31.1
The 's390-virtio' machine was removed from qemu in the 2.6 release. Use the more modern s390-ccw-virtio machine type and use VIR_TEST_CAPS_ARCH_LATEST to invoke it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../s390-allow-bogus-usb-controller.args | 31 --------------- ...low-bogus-usb-controller.s390x-latest.args | 39 +++++++++++++++++++ .../s390-allow-bogus-usb-controller.xml | 2 +- tests/qemuxml2argvtest.c | 5 +-- 4 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args deleted file mode 100644 index fd698eaa46..0000000000 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name test \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 \ --object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-s390,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args new file mode 100644 index 0000000000..527141d70a --- /dev/null +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=test,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 \ +-audiodev id=audio1,driver=none \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0002 \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \ +-device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0003 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml index 6b51f8bf8e..5afc23dbba 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml @@ -4,7 +4,7 @@ <memory>219100</memory> <currentMemory>219100</currentMemory> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d4b6cb680c..8e84734e61 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2541,10 +2541,7 @@ mymain(void) QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); - DO_TEST("s390-allow-bogus-usb-controller", - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW, -- 2.31.1
qemuDomainDefAddDefaultDevices skipped adding the memballoon for the 's390-virtio' machine type, but since it was removed in qemu 2.6 we can remove the hack now. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f57cae00e..18b5403974 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3883,10 +3883,6 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, def->memballoon = memballoon; } - if (STRPREFIX(def->os.machine, "s390-virtio") && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390) && def->memballoon) - def->memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_NONE; - if (addDefaultUSBMouse) { bool hasUSBTablet = false; size_t j; -- 2.31.1
The machine type was removed in qemu 2.6 and no tests now depend on it. Remove the faking of the machine type support and the capabilities test for it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 2 +- tests/vircapstest.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 1444abc401..be576037e2 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -73,7 +73,7 @@ static const char *const riscv64_machines[] = { "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL }; static const char *const s390x_machines[] = { - "s390-virtio", "s390-ccw-virtio", "s390-ccw", NULL + "s390-ccw-virtio", "s390-ccw", NULL }; static const char *const sparc_machines[] = { "SS-5", "LX", "SPARCClassic", "SPARCbook", diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 8cb6fafd1d..7ec5b85222 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -180,10 +180,6 @@ test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED) CAPSCOMP(-1, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_NONE, NULL, NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv64", "spike_v1.10"); - CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "s390-virtio", - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_S390X, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-s390x", - "s390-virtio"); CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries", VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, -- 2.31.1
QEMU commit 7b3fdbd9a826791bd98e649cf44c0a6129a44179 released in 2.6 dropped the legacy s390 virtio machine and it's devices. Remove our probing based on the devices. The probing of properties of the appropriate devices will be removed subsequently. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 75dd01f06e..e5f2283971 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1204,12 +1204,10 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "usb-redir", QEMU_CAPS_USB_REDIR }, { "usb-hub", QEMU_CAPS_USB_HUB }, { "ich9-ahci", QEMU_CAPS_ICH9_AHCI }, - { "virtio-blk-s390", QEMU_CAPS_VIRTIO_S390 }, { "virtio-blk-ccw", QEMU_CAPS_VIRTIO_CCW }, { "sclpconsole", QEMU_CAPS_DEVICE_SCLPCONSOLE }, { "lsi53c895a", QEMU_CAPS_SCSI_LSI }, { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, - { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, @@ -1221,7 +1219,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA }, { "usb-serial", QEMU_CAPS_DEVICE_USB_SERIAL }, { "virtio-rng-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG }, - { "virtio-rng-s390", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-device", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "rng-random", QEMU_CAPS_OBJECT_RNG_RANDOM }, @@ -1250,7 +1247,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "e1000", QEMU_CAPS_DEVICE_E1000 }, { "virtio-net-pci", QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-net-ccw", QEMU_CAPS_DEVICE_VIRTIO_NET }, - { "virtio-net-s390", QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-net-device", QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-gpu-pci", QEMU_CAPS_DEVICE_VIRTIO_GPU }, { "virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU }, -- 2.31.1
The devices no longer exist in qemu since the 2.6 release. Drop the probing of the device properties and fix the data for qemucapabilitiestest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 6 - .../caps_2.11.0.s390x.replies | 108 +++++------ .../caps_2.11.0.x86_64.replies | 152 +++++++--------- .../caps_2.12.0.aarch64.replies | 132 ++++++-------- .../caps_2.12.0.ppc64.replies | 124 ++++++------- .../caps_2.12.0.s390x.replies | 116 ++++++------ .../caps_2.12.0.x86_64.replies | 168 ++++++++---------- .../caps_3.0.0.ppc64.replies | 124 ++++++------- .../caps_3.0.0.riscv32.replies | 100 +++++------ .../caps_3.0.0.riscv64.replies | 100 +++++------ .../caps_3.0.0.s390x.replies | 120 ++++++------- .../caps_3.0.0.x86_64.replies | 168 ++++++++---------- .../caps_3.1.0.ppc64.replies | 124 ++++++------- .../caps_3.1.0.x86_64.replies | 168 ++++++++---------- .../caps_4.0.0.aarch64.replies | 136 +++++++------- .../caps_4.0.0.ppc64.replies | 132 ++++++-------- .../caps_4.0.0.riscv32.replies | 128 ++++++------- .../caps_4.0.0.riscv64.replies | 128 ++++++------- .../caps_4.0.0.s390x.replies | 120 ++++++------- .../caps_4.0.0.x86_64.replies | 168 ++++++++---------- .../caps_4.1.0.x86_64.replies | 160 ++++++++--------- .../caps_4.2.0.aarch64.replies | 144 +++++++-------- .../caps_4.2.0.ppc64.replies | 132 ++++++-------- .../caps_4.2.0.s390x.replies | 124 ++++++------- .../caps_4.2.0.x86_64.replies | 164 ++++++++--------- .../caps_5.0.0.aarch64.replies | 144 +++++++-------- .../caps_5.0.0.ppc64.replies | 140 +++++++-------- .../caps_5.0.0.riscv64.replies | 132 ++++++-------- .../caps_5.0.0.x86_64.replies | 164 ++++++++--------- .../caps_5.1.0.x86_64.replies | 164 ++++++++--------- .../caps_5.2.0.aarch64.replies | 148 +++++++-------- .../caps_5.2.0.ppc64.replies | 140 +++++++-------- .../caps_5.2.0.riscv64.replies | 132 ++++++-------- .../caps_5.2.0.s390x.replies | 124 ++++++------- .../caps_5.2.0.x86_64.replies | 164 ++++++++--------- .../caps_6.0.0.s390x.replies | 124 ++++++------- .../caps_6.0.0.x86_64.replies | 164 ++++++++--------- .../caps_6.1.0.x86_64.replies | 164 ++++++++--------- 38 files changed, 2276 insertions(+), 2874 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e5f2283971..341f786bda 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1606,12 +1606,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = { { "virtio-scsi-ccw", virQEMUCapsDevicePropsVirtioSCSI, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioSCSI), QEMU_CAPS_VIRTIO_SCSI }, - { "virtio-blk-s390", virQEMUCapsDevicePropsVirtioBlk, - G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioBlk), - QEMU_CAPS_VIRTIO_S390 }, - { "virtio-net-s390", virQEMUCapsDevicePropsVirtioNet, - G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioNet), - QEMU_CAPS_DEVICE_VIRTIO_NET }, { "vfio-pci", virQEMUCapsDevicePropsVfioPCI, G_N_ELEMENTS(virQEMUCapsDevicePropsVfioPCI), QEMU_CAPS_DEVICE_VFIO_PCI }, diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 5eeeb42d19..c8cd0ba116 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -12479,28 +12479,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -12612,7 +12596,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -12620,7 +12604,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -12734,7 +12718,7 @@ "type": "uint64" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -12742,11 +12726,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -12758,11 +12742,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -12774,11 +12758,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -12790,11 +12774,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -12806,11 +12790,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -12822,7 +12806,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -12973,7 +12957,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -12981,7 +12965,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -13028,7 +13012,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -13036,11 +13020,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -13052,7 +13036,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13195,7 +13179,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13203,7 +13187,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13265,7 +13249,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13273,7 +13257,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13317,7 +13301,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13325,7 +13309,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -13390,7 +13374,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -13398,7 +13382,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -13408,7 +13392,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -13416,7 +13400,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -13510,12 +13494,12 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -13568,12 +13552,12 @@ "cpu-max": 248 } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-cpu-definitions", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -14107,35 +14091,35 @@ "migration-safe": true } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-models", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-types", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ "emulator" ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-command-line-options", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -15256,12 +15240,12 @@ "option": "drive" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-migrate-capabilities", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -15319,7 +15303,7 @@ "capability": "x-multifd" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -15330,7 +15314,7 @@ "name": "host" } }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -15369,7 +15353,7 @@ } } }, - "id": "libvirt-37" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index a538cf17ce..8c72203f2c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -12658,28 +12658,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -12791,7 +12775,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -12799,7 +12783,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -12913,7 +12897,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -12921,7 +12905,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -12997,7 +12981,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -13005,7 +12989,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -13068,7 +13052,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -13076,7 +13060,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -13125,7 +13109,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -13133,7 +13117,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -13175,7 +13159,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -13183,7 +13167,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -13265,7 +13249,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -13273,7 +13257,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -13346,7 +13330,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -13354,7 +13338,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -13368,7 +13352,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -13376,7 +13360,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -13433,7 +13417,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -13441,7 +13425,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -13484,7 +13468,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -13492,7 +13476,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13587,7 +13571,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13595,7 +13579,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13756,7 +13740,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13764,7 +13748,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13821,7 +13805,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13829,7 +13813,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -13925,7 +13909,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -13933,7 +13917,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -14076,7 +14060,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -14084,11 +14068,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -14100,7 +14084,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -14144,7 +14128,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -14152,7 +14136,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -14232,7 +14216,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -14240,7 +14224,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -14275,7 +14259,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -14283,7 +14267,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -14326,7 +14310,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -14334,7 +14318,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -14344,7 +14328,7 @@ "type": "link<memory-backend>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -14352,7 +14336,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -14454,7 +14438,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -14462,7 +14446,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -14556,12 +14540,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -14750,12 +14734,12 @@ "cpu-max": 288 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -15069,24 +15053,24 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15094,12 +15078,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16394,12 +16378,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16457,7 +16441,7 @@ "capability": "x-multifd" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16468,7 +16452,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -16648,7 +16632,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -16830,7 +16814,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17075,7 +17059,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17089,7 +17073,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -17269,7 +17253,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -17451,7 +17435,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -17696,7 +17680,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 884db53152..774db99dc3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -15480,28 +15480,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15627,7 +15611,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15635,7 +15619,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15769,7 +15753,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15777,7 +15761,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15874,7 +15858,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15882,11 +15866,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -15898,11 +15882,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -15914,11 +15898,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -15930,7 +15914,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16003,7 +15987,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16011,11 +15995,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -16027,7 +16011,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16084,7 +16068,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16092,7 +16076,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16243,7 +16227,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16251,7 +16235,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16298,7 +16282,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16306,11 +16290,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -16322,7 +16306,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16465,7 +16449,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16473,11 +16457,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -16489,7 +16473,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16533,7 +16517,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16541,7 +16525,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16621,7 +16605,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16629,7 +16613,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16731,7 +16715,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16739,7 +16723,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16833,7 +16817,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16841,7 +16825,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16895,7 +16879,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16903,7 +16887,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16957,7 +16941,7 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16965,7 +16949,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17080,12 +17064,12 @@ "type": "child<irq>" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17382,7 +17366,7 @@ "cpu-max": 1 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17390,7 +17374,7 @@ "arguments": { "typename": "virt-2.12-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -17520,12 +17504,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -17701,35 +17685,35 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "emulator" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18894,12 +18878,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -18961,12 +18945,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -18982,7 +18966,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 2179533ec0..0340486215 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -15469,28 +15469,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15616,7 +15600,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15624,7 +15608,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15738,7 +15722,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15746,7 +15730,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15822,7 +15806,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15830,11 +15814,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -15846,11 +15830,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -15862,11 +15846,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -15878,7 +15862,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -15951,7 +15935,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -15959,11 +15943,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -15975,7 +15959,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16032,7 +16016,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16040,7 +16024,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16191,7 +16175,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16199,7 +16183,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16246,7 +16230,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16254,11 +16238,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -16270,7 +16254,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16413,7 +16397,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16421,11 +16405,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -16437,7 +16421,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16481,7 +16465,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16489,7 +16473,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16569,7 +16553,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16577,7 +16561,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16635,7 +16619,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16643,7 +16627,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16737,7 +16721,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16745,7 +16729,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16799,7 +16783,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16807,7 +16791,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16857,12 +16841,12 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17000,7 +16984,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17008,7 +16992,7 @@ "arguments": { "typename": "pseries-2.12-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17169,12 +17153,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19370,35 +19354,35 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20554,12 +20538,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20621,7 +20605,7 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index ba24ed51c7..54af6da97d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -14043,28 +14043,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -14190,7 +14174,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -14198,7 +14182,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -14316,7 +14300,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -14324,11 +14308,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -14340,11 +14324,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -14356,11 +14340,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -14372,11 +14356,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -14388,11 +14372,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -14404,7 +14388,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -14555,7 +14539,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -14563,7 +14547,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -14610,7 +14594,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -14618,11 +14602,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -14634,7 +14618,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -14777,7 +14761,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -14785,7 +14769,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -14847,7 +14831,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -14855,7 +14839,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -14899,7 +14883,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -14907,7 +14891,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -14972,7 +14956,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -14980,7 +14964,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -14995,7 +14979,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -15003,7 +14987,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -15097,7 +15081,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -15105,7 +15089,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -15159,7 +15143,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -15167,7 +15151,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -15217,12 +15201,12 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -15280,12 +15264,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -15820,35 +15804,35 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16973,12 +16957,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17040,7 +17024,7 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17051,7 +17035,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17089,7 +17073,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index a90da27217..465d185b6e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -14327,28 +14327,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -14474,7 +14458,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -14482,7 +14466,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -14596,7 +14580,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -14604,7 +14588,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -14680,7 +14664,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -14688,7 +14672,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -14751,7 +14735,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -14759,7 +14743,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -14808,7 +14792,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -14816,7 +14800,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -14858,7 +14842,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -14866,7 +14850,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -14948,7 +14932,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -14956,7 +14940,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15029,7 +15013,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15037,7 +15021,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -15051,7 +15035,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -15059,7 +15043,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15116,7 +15100,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15124,7 +15108,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15167,7 +15151,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15175,7 +15159,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15270,7 +15254,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15278,7 +15262,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15429,7 +15413,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15437,7 +15421,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -15484,7 +15468,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -15492,7 +15476,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -15588,7 +15572,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -15596,7 +15580,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -15739,7 +15723,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -15747,11 +15731,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -15763,7 +15747,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -15807,7 +15791,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -15815,7 +15799,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -15895,7 +15879,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -15903,7 +15887,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -15942,7 +15926,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -15950,7 +15934,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -15993,7 +15977,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16001,7 +15985,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16011,7 +15995,7 @@ "type": "link<memory-backend>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16019,7 +16003,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16121,7 +16105,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16129,7 +16113,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16223,7 +16207,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16231,7 +16215,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -16285,7 +16269,7 @@ "type": "string" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -16293,7 +16277,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -16343,7 +16327,7 @@ "type": "string" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -16351,7 +16335,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17373,12 +17357,12 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -17577,12 +17561,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -18096,12 +18080,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -18109,12 +18093,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18122,12 +18106,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19414,12 +19398,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19481,12 +19465,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19496,7 +19480,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19507,7 +19491,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19697,7 +19681,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19889,7 +19873,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -20144,7 +20128,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -20158,7 +20142,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -20348,7 +20332,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -20540,7 +20524,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -20795,7 +20779,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index 7f024bcc32..4b826700b2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -16332,28 +16332,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16487,7 +16471,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16495,7 +16479,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16613,7 +16597,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16621,7 +16605,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16697,7 +16681,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16705,11 +16689,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -16721,11 +16705,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -16737,11 +16721,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -16753,7 +16737,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16826,7 +16810,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16834,11 +16818,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -16850,7 +16834,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16907,7 +16891,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16915,7 +16899,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17066,7 +17050,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17074,7 +17058,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17121,7 +17105,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17129,11 +17113,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17145,7 +17129,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17288,7 +17272,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17296,11 +17280,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17312,7 +17296,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17356,7 +17340,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17364,7 +17348,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17444,7 +17428,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17452,7 +17436,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17510,7 +17494,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17518,7 +17502,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17612,7 +17596,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17620,7 +17604,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17670,7 +17654,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17678,7 +17662,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17728,12 +17712,12 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17876,7 +17860,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17884,7 +17868,7 @@ "arguments": { "typename": "pseries-3.0-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18055,12 +18039,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20256,35 +20240,35 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21414,12 +21398,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21489,7 +21473,7 @@ "capability": "late-block-activate" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index f074387707..5a0085cffb 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -12826,28 +12826,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -12965,7 +12949,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -12973,11 +12957,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -12989,11 +12973,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -13005,11 +12989,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -13021,11 +13005,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -13037,11 +13021,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -13053,11 +13037,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -13069,7 +13053,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -13116,7 +13100,7 @@ "type": "size" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -13124,11 +13108,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -13140,11 +13124,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -13156,11 +13140,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -13172,7 +13156,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13216,7 +13200,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13224,7 +13208,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13318,7 +13302,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13326,7 +13310,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13376,7 +13360,7 @@ "type": "string" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13384,7 +13368,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -13434,12 +13418,12 @@ "type": "string" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -13476,7 +13460,7 @@ "cpu-max": 1 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -13484,7 +13468,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -13589,23 +13573,23 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -13613,12 +13597,12 @@ "passthrough", "emulator" ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -14743,12 +14727,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -14818,5 +14802,5 @@ "capability": "late-block-activate" } ], - "id": "libvirt-34" + "id": "libvirt-33" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 02a3461dcf..c39635b6a5 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -12826,28 +12826,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -12965,7 +12949,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -12973,11 +12957,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -12989,11 +12973,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -13005,11 +12989,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -13021,11 +13005,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -13037,11 +13021,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -13053,11 +13037,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -13069,7 +13053,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -13116,7 +13100,7 @@ "type": "size" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -13124,11 +13108,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -13140,11 +13124,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -13156,11 +13140,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -13172,7 +13156,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13216,7 +13200,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -13224,7 +13208,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13318,7 +13302,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -13326,7 +13310,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13376,7 +13360,7 @@ "type": "string" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -13384,7 +13368,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -13434,12 +13418,12 @@ "type": "string" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -13476,7 +13460,7 @@ "cpu-max": 1 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -13484,7 +13468,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -13589,23 +13573,23 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -13613,12 +13597,12 @@ "passthrough", "emulator" ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -14743,12 +14727,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -14818,5 +14802,5 @@ "capability": "late-block-activate" } ], - "id": "libvirt-34" + "id": "libvirt-33" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 116f2a2f9f..b6405a66eb 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -14413,28 +14413,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -14568,7 +14552,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -14576,7 +14560,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -14694,7 +14678,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -14702,11 +14686,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -14718,11 +14702,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -14734,7 +14718,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -14783,7 +14767,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -14791,11 +14775,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -14807,11 +14791,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -14823,11 +14807,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -14839,7 +14823,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15000,7 +14984,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15008,7 +14992,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15065,7 +15049,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15073,11 +15057,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -15089,7 +15073,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15232,7 +15216,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15240,7 +15224,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -15302,7 +15286,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -15310,7 +15294,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -15354,7 +15338,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -15362,7 +15346,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -15437,7 +15421,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -15445,7 +15429,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -15460,7 +15444,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -15468,7 +15452,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -15562,7 +15546,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -15570,7 +15554,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -15620,7 +15604,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -15628,7 +15612,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -15678,12 +15662,12 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -15746,12 +15730,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16302,35 +16286,35 @@ "migration-safe": true } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17490,12 +17474,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17565,7 +17549,7 @@ "capability": "late-block-activate" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17576,7 +17560,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17618,7 +17602,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index c86f5a122e..a2dbec4b47 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -14895,28 +14895,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15050,7 +15034,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15058,7 +15042,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15176,7 +15160,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15184,7 +15168,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15260,7 +15244,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15268,7 +15252,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -15331,7 +15315,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -15339,7 +15323,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15388,7 +15372,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15396,7 +15380,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -15438,7 +15422,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -15446,7 +15430,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -15528,7 +15512,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -15536,7 +15520,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15619,7 +15603,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15627,7 +15611,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -15641,7 +15625,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -15649,7 +15633,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15710,7 +15694,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15718,7 +15702,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15765,7 +15749,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15773,7 +15757,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15872,7 +15856,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15880,7 +15864,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16041,7 +16025,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16049,7 +16033,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16106,7 +16090,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16114,7 +16098,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16210,7 +16194,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16218,7 +16202,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16361,7 +16345,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16369,11 +16353,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -16385,7 +16369,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16429,7 +16413,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16437,7 +16421,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16517,7 +16501,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16525,7 +16509,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16564,7 +16548,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16572,7 +16556,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16615,7 +16599,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16623,7 +16607,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16657,7 +16641,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16665,7 +16649,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16767,7 +16751,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16775,7 +16759,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16869,7 +16853,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16877,7 +16861,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -16927,7 +16911,7 @@ "type": "string" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -16935,7 +16919,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -16985,7 +16969,7 @@ "type": "string" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -16993,7 +16977,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18047,12 +18031,12 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -18261,12 +18245,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -18703,12 +18687,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -18716,12 +18700,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18729,12 +18713,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -20033,12 +20017,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -20108,16 +20092,16 @@ "capability": "late-block-activate" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -20132,7 +20116,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20325,7 +20309,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20520,7 +20504,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -20783,7 +20767,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -20797,7 +20781,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -20990,7 +20974,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -21185,7 +21169,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -21448,7 +21432,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index 5341a9b2ef..8ad3f766ea 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -16064,28 +16064,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16223,7 +16207,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16231,7 +16215,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16349,7 +16333,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16357,7 +16341,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16433,7 +16417,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16441,11 +16425,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -16457,11 +16441,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -16473,11 +16457,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -16489,7 +16473,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16572,7 +16556,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16580,11 +16564,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -16596,7 +16580,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16670,7 +16654,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16678,7 +16662,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16829,7 +16813,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16837,7 +16821,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16884,7 +16868,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16892,11 +16876,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -16908,7 +16892,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17051,7 +17035,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17059,11 +17043,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17075,7 +17059,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17119,7 +17103,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17127,7 +17111,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17207,7 +17191,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17215,7 +17199,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17273,7 +17257,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17281,7 +17265,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17375,7 +17359,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17383,7 +17367,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17444,7 +17428,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17452,7 +17436,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17512,12 +17496,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17665,7 +17649,7 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17673,7 +17657,7 @@ "arguments": { "typename": "pseries-3.1-machine" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17847,12 +17831,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20048,35 +20032,35 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21211,12 +21195,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21286,7 +21270,7 @@ "capability": "late-block-activate" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 25332dc2a3..ec1f62d80d 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -15226,28 +15226,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15385,7 +15369,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15393,7 +15377,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15511,7 +15495,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15519,7 +15503,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15595,7 +15579,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15603,7 +15587,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -15666,7 +15650,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -15674,7 +15658,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15723,7 +15707,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15731,7 +15715,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -15773,7 +15757,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -15781,7 +15765,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -15863,7 +15847,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -15871,7 +15855,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15954,7 +15938,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15962,7 +15946,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -15976,7 +15960,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -15984,7 +15968,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16058,7 +16042,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16066,7 +16050,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16113,7 +16097,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16121,7 +16105,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -16220,7 +16204,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -16228,7 +16212,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16389,7 +16373,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16397,7 +16381,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16454,7 +16438,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16462,7 +16446,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16558,7 +16542,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16566,7 +16550,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16709,7 +16693,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16717,11 +16701,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -16733,7 +16717,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16777,7 +16761,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16785,7 +16769,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16865,7 +16849,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16873,7 +16857,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16912,7 +16896,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16920,7 +16904,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16963,7 +16947,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16971,7 +16955,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17005,7 +16989,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17013,7 +16997,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -17115,7 +17099,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -17123,7 +17107,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -17217,7 +17201,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -17225,7 +17209,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17286,7 +17270,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17294,7 +17278,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17354,7 +17338,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17362,7 +17346,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18464,12 +18448,12 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -18688,12 +18672,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -19212,12 +19196,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -19225,12 +19209,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -19238,12 +19222,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -20517,12 +20501,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -20592,16 +20576,16 @@ "capability": "late-block-activate" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -20616,7 +20600,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20818,7 +20802,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -21022,7 +21006,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -21297,7 +21281,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -21311,7 +21295,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -21513,7 +21497,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -21717,7 +21701,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -21992,7 +21976,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies index 1c807c7475..d2f62fb0ec 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies @@ -16541,28 +16541,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16708,7 +16692,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16716,7 +16700,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16854,7 +16838,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16862,7 +16846,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16959,7 +16943,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16967,11 +16951,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -16983,11 +16967,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -16999,11 +16983,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -17015,7 +16999,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17098,7 +17082,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17106,11 +17090,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17122,7 +17106,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17196,7 +17180,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17204,7 +17188,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17251,7 +17235,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17259,7 +17243,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17406,7 +17390,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17414,7 +17398,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17466,7 +17450,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17474,11 +17458,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17490,7 +17474,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17642,7 +17626,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17650,11 +17634,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17666,7 +17650,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17719,7 +17703,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17727,7 +17711,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17807,7 +17791,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17815,7 +17799,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17917,7 +17901,7 @@ "type": "size" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17925,7 +17909,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18019,7 +18003,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18027,7 +18011,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18092,7 +18076,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18100,7 +18084,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18164,7 +18148,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18172,7 +18156,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18287,12 +18271,12 @@ "type": "child<irq>" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18634,7 +18618,7 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18642,7 +18626,7 @@ "arguments": { "typename": "virt-4.0-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18777,12 +18761,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18973,34 +18957,34 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -20148,12 +20132,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -20227,12 +20211,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -20248,7 +20232,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies index 9d7b62ba18..90cb945ff6 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies @@ -16501,28 +16501,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16668,7 +16652,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16676,7 +16660,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16814,7 +16798,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16822,7 +16806,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16919,7 +16903,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16927,11 +16911,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -16943,11 +16927,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -16959,11 +16943,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -16975,7 +16959,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17058,7 +17042,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17066,11 +17050,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17082,7 +17066,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17156,7 +17140,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17164,7 +17148,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17211,7 +17195,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17219,7 +17203,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17366,7 +17350,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17374,7 +17358,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17426,7 +17410,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17434,11 +17418,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17450,7 +17434,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17602,7 +17586,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17610,11 +17594,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17626,7 +17610,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17679,7 +17663,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17687,7 +17671,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17767,7 +17751,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17775,7 +17759,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17833,7 +17817,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17841,7 +17825,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17943,7 +17927,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17951,7 +17935,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18045,7 +18029,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18053,7 +18037,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18118,7 +18102,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18126,7 +18110,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18190,12 +18174,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18348,7 +18332,7 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18356,7 +18340,7 @@ "arguments": { "typename": "pseries-4.0-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18555,12 +18539,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20756,34 +20740,34 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21926,12 +21910,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22005,7 +21989,7 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index 2cd26c62de..126d7ef2ff 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -14830,28 +14830,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -14997,7 +14981,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15005,7 +14989,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15143,7 +15127,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15151,7 +15135,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15248,7 +15232,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15256,11 +15240,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -15272,7 +15256,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15321,7 +15305,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15329,11 +15313,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -15345,11 +15329,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -15361,7 +15345,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15444,7 +15428,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15452,11 +15436,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -15468,7 +15452,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15542,7 +15526,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15550,7 +15534,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15597,7 +15581,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15605,7 +15589,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15762,7 +15746,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15770,7 +15754,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15832,7 +15816,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15840,11 +15824,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -15856,7 +15840,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16008,7 +15992,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16016,11 +16000,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -16032,7 +16016,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16085,7 +16069,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16093,7 +16077,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16173,7 +16157,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16181,7 +16165,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16283,7 +16267,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16291,7 +16275,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16385,7 +16369,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16393,7 +16377,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16458,7 +16442,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16466,7 +16450,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16530,12 +16514,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16572,7 +16556,7 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16580,7 +16564,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16685,34 +16669,34 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17984,12 +17968,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -18063,5 +18047,5 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-41" + "id": "libvirt-40" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 9db901ee42..557c76836d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -14830,28 +14830,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -14997,7 +14981,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15005,7 +14989,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15143,7 +15127,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15151,7 +15135,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15248,7 +15232,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15256,11 +15240,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -15272,7 +15256,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15321,7 +15305,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -15329,11 +15313,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -15345,11 +15329,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -15361,7 +15345,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15444,7 +15428,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -15452,11 +15436,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -15468,7 +15452,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15542,7 +15526,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15550,7 +15534,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15597,7 +15581,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15605,7 +15589,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15762,7 +15746,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -15770,7 +15754,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15832,7 +15816,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15840,11 +15824,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -15856,7 +15840,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16008,7 +15992,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16016,11 +16000,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -16032,7 +16016,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16085,7 +16069,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16093,7 +16077,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16173,7 +16157,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16181,7 +16165,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16283,7 +16267,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16291,7 +16275,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16385,7 +16369,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16393,7 +16377,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16458,7 +16442,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16466,7 +16450,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -16530,12 +16514,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16572,7 +16556,7 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16580,7 +16564,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16685,34 +16669,34 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17984,12 +17968,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -18063,5 +18047,5 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-41" + "id": "libvirt-40" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies index 6be87ea88a..9c55cd11a9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies @@ -15115,28 +15115,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15282,7 +15266,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15290,7 +15274,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15428,7 +15412,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -15436,11 +15420,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-hd' not found" @@ -15452,11 +15436,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -15468,7 +15452,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -15517,7 +15501,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -15525,11 +15509,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -15541,11 +15525,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -15557,11 +15541,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -15573,7 +15557,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15730,7 +15714,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -15738,7 +15722,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15800,7 +15784,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -15808,11 +15792,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -15824,7 +15808,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15976,7 +15960,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -15984,7 +15968,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16055,7 +16039,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16063,7 +16047,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16116,7 +16100,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16124,7 +16108,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16204,7 +16188,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16212,7 +16196,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16227,7 +16211,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16235,7 +16219,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16329,7 +16313,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -16337,7 +16321,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16402,7 +16386,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -16410,7 +16394,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -16474,12 +16458,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -16552,12 +16536,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17132,34 +17116,34 @@ "migration-safe": true } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18302,12 +18286,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18381,7 +18365,7 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18392,7 +18376,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18437,7 +18421,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index d17d9ce51b..416d5bebf9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -15654,28 +15654,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15821,7 +15805,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -15829,7 +15813,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15967,7 +15951,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15975,7 +15959,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16072,7 +16056,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16080,7 +16064,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -16143,7 +16127,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -16151,7 +16135,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -16200,7 +16184,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -16208,7 +16192,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -16250,7 +16234,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -16258,7 +16242,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16340,7 +16324,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16348,7 +16332,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -16431,7 +16415,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -16439,7 +16423,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16453,7 +16437,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16461,7 +16445,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16535,7 +16519,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16543,7 +16527,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16590,7 +16574,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16598,7 +16582,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -16697,7 +16681,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -16705,7 +16689,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16862,7 +16846,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16870,7 +16854,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16932,7 +16916,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16940,7 +16924,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17036,7 +17020,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17044,7 +17028,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17196,7 +17180,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17204,11 +17188,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17220,7 +17204,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17273,7 +17257,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17281,7 +17265,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17361,7 +17345,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17369,7 +17353,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17417,7 +17401,7 @@ "type": "uint8" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17425,7 +17409,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17468,7 +17452,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17476,7 +17460,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17510,7 +17494,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17518,7 +17502,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -17620,7 +17604,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -17628,7 +17612,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -17722,7 +17706,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -17730,7 +17714,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17795,7 +17779,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -17803,7 +17787,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17867,7 +17851,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17875,7 +17859,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18993,12 +18977,12 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -19217,12 +19201,12 @@ "alias": "q35" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -19739,12 +19723,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -19752,12 +19736,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -19765,12 +19749,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -21052,12 +21036,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -21131,16 +21115,16 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -21155,7 +21139,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -21359,7 +21343,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -21565,7 +21549,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -21844,7 +21828,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -21858,7 +21842,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -22062,7 +22046,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -22268,7 +22252,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -22547,7 +22531,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies index 569addd5d1..78216e7698 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies @@ -16026,28 +16026,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16193,7 +16177,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16201,7 +16185,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16339,7 +16323,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16347,7 +16331,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16444,7 +16428,7 @@ "type": "BlockdevOnError" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16452,7 +16436,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -16515,7 +16499,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -16523,7 +16507,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -16572,7 +16556,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -16580,7 +16564,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -16622,7 +16606,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -16630,7 +16614,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16712,7 +16696,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -16720,7 +16704,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -16803,7 +16787,7 @@ "type": "BlockdevOnError" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -16811,7 +16795,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16825,7 +16809,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -16833,7 +16817,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16915,7 +16899,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16923,7 +16907,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16970,7 +16954,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16978,7 +16962,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17077,7 +17061,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17085,7 +17069,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17255,7 +17239,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17263,7 +17247,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17329,7 +17313,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17337,7 +17321,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17433,7 +17417,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17441,7 +17425,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17601,7 +17585,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17609,11 +17593,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17625,7 +17609,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17686,7 +17670,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17694,7 +17678,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17774,7 +17758,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17782,7 +17766,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17830,7 +17814,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17838,7 +17822,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17881,7 +17865,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17889,7 +17873,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17923,7 +17907,7 @@ "type": "int32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17931,7 +17915,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18033,7 +18017,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18041,7 +18025,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18135,7 +18119,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18143,7 +18127,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18208,7 +18192,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18216,7 +18200,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18280,7 +18264,7 @@ "type": "int" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18288,7 +18272,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -19453,12 +19437,12 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -19782,12 +19766,12 @@ "deprecated": false } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -20932,12 +20916,12 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -20945,12 +20929,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -20958,12 +20942,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -22237,12 +22221,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -22316,16 +22300,16 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { - "id": "libvirt-47", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -22340,7 +22324,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -22548,7 +22532,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -22562,7 +22546,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -22770,7 +22754,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies index eefb1564c3..30f70c8fb9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies @@ -17278,28 +17278,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -17449,7 +17433,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -17457,7 +17441,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17607,7 +17591,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17615,7 +17599,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -17724,7 +17708,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -17732,11 +17716,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -17748,11 +17732,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -17764,11 +17748,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -17780,7 +17764,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17863,7 +17847,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17871,11 +17855,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17887,7 +17871,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17973,7 +17957,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17981,7 +17965,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18032,7 +18016,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18040,7 +18024,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18214,7 +18198,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18222,7 +18206,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18283,7 +18267,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18291,11 +18275,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18307,7 +18291,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18481,7 +18465,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -18489,11 +18473,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18505,7 +18489,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18571,7 +18555,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18579,7 +18563,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18663,7 +18647,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18671,7 +18655,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18773,7 +18757,7 @@ "type": "size" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18781,7 +18765,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18875,7 +18859,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18883,7 +18867,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18954,7 +18938,7 @@ "type": "uint16" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18962,7 +18946,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19027,7 +19011,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19035,7 +19019,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19099,7 +19083,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19107,7 +19091,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19294,12 +19278,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19857,7 +19841,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19865,7 +19849,7 @@ "arguments": { "typename": "virt-4.2-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20018,12 +20002,12 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20214,34 +20198,34 @@ "static": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -21409,12 +21393,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -21492,12 +21476,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -21513,7 +21497,7 @@ "kernel": false } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -21524,7 +21508,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -21554,7 +21538,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies index b7c04b5eac..48a6ff347d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies @@ -16735,28 +16735,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16902,7 +16886,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16910,7 +16894,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17048,7 +17032,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17056,7 +17040,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -17153,7 +17137,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -17161,11 +17145,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -17177,11 +17161,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -17193,11 +17177,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -17209,7 +17193,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17292,7 +17276,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17300,11 +17284,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17316,7 +17300,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17398,7 +17382,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17406,7 +17390,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17453,7 +17437,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17461,7 +17445,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17626,7 +17610,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17634,7 +17618,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17690,7 +17674,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17698,11 +17682,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17714,7 +17698,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17879,7 +17863,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17887,11 +17871,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17903,7 +17887,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17964,7 +17948,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17972,7 +17956,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18052,7 +18036,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -18060,7 +18044,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18126,7 +18110,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18134,7 +18118,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18236,7 +18220,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18244,7 +18228,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18338,7 +18322,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18346,7 +18330,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18411,7 +18395,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18419,7 +18403,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18483,12 +18467,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18750,7 +18734,7 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18758,7 +18742,7 @@ "arguments": { "typename": "pseries-4.2-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18957,12 +18941,12 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21158,34 +21142,34 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22324,12 +22308,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22407,7 +22391,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies index b9061455b1..0a7dbc1851 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -15722,28 +15722,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15893,7 +15877,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -15901,7 +15885,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16051,7 +16035,7 @@ "type": "str" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16059,11 +16043,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-hd' not found" @@ -16075,11 +16059,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -16091,7 +16075,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -16140,7 +16124,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -16148,11 +16132,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -16164,11 +16148,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -16180,11 +16164,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -16196,7 +16180,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16380,7 +16364,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -16388,7 +16372,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16459,7 +16443,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -16467,11 +16451,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -16483,7 +16467,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16657,7 +16641,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -16665,7 +16649,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16749,7 +16733,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -16757,7 +16741,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16823,7 +16807,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16831,7 +16815,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16920,7 +16904,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -16928,7 +16912,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16943,7 +16927,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -16951,7 +16935,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17045,7 +17029,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17053,7 +17037,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17124,7 +17108,7 @@ "type": "uint16" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17132,7 +17116,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17197,7 +17181,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17205,7 +17189,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -17269,12 +17253,12 @@ "type": "int" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -17401,12 +17385,12 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18013,34 +17997,34 @@ "migration-safe": true } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -19187,12 +19171,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -19270,7 +19254,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -19281,7 +19265,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -19335,7 +19319,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies index 97267c13b2..d8585fe0f8 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies @@ -16506,28 +16506,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16677,7 +16661,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16685,7 +16669,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16835,7 +16819,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16843,7 +16827,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16952,7 +16936,7 @@ "type": "BlockdevOnError" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16960,7 +16944,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -17027,7 +17011,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -17035,7 +17019,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -17084,7 +17068,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -17092,7 +17076,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17134,7 +17118,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -17142,7 +17126,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17224,7 +17208,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -17232,7 +17216,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17315,7 +17299,7 @@ "type": "BlockdevOnError" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17323,7 +17307,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17337,7 +17321,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -17345,7 +17329,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17431,7 +17415,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17439,7 +17423,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17490,7 +17474,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17498,7 +17482,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17601,7 +17585,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17609,7 +17593,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17793,7 +17777,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17801,7 +17785,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17872,7 +17856,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -17880,7 +17864,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17980,7 +17964,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17988,7 +17972,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18162,7 +18146,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -18170,11 +18154,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18186,7 +18170,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18252,7 +18236,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18260,7 +18244,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18344,7 +18328,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18352,7 +18336,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18400,7 +18384,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18408,7 +18392,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18455,7 +18439,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18463,7 +18447,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18497,7 +18481,7 @@ "type": "int32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18505,7 +18489,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18607,7 +18591,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18615,7 +18599,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18709,7 +18693,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18717,7 +18701,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18788,7 +18772,7 @@ "type": "uint16" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18796,7 +18780,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18861,7 +18845,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18869,7 +18853,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18933,7 +18917,7 @@ "type": "int" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18941,7 +18925,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -20495,12 +20479,12 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -20892,12 +20876,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -22280,12 +22264,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -22293,12 +22277,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -22306,12 +22290,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -23597,12 +23581,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -23680,16 +23664,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -23704,7 +23688,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -24006,7 +23990,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -24020,7 +24004,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -24322,7 +24306,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies index 9ae2d38c2c..23cb94ebea 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies @@ -18365,28 +18365,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18557,7 +18541,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18565,7 +18549,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18742,7 +18726,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18750,7 +18734,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18878,7 +18862,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18886,11 +18870,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -18902,11 +18886,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -18918,11 +18902,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -18934,7 +18918,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19029,7 +19013,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19037,11 +19021,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19053,7 +19037,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19148,7 +19132,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19156,7 +19140,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19209,7 +19193,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19217,7 +19201,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19423,7 +19407,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19431,7 +19415,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19509,7 +19493,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19517,11 +19501,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -19533,7 +19517,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19736,7 +19720,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19744,11 +19728,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19760,7 +19744,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19841,7 +19825,7 @@ "type": "int" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19849,7 +19833,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19942,7 +19926,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19950,7 +19934,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20071,7 +20055,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20079,7 +20063,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20173,7 +20157,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20181,7 +20165,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20257,7 +20241,7 @@ "type": "uint16" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20265,7 +20249,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20335,7 +20319,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20343,7 +20327,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20412,7 +20396,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20420,7 +20404,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20624,12 +20608,12 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21217,7 +21201,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21225,7 +21209,7 @@ "arguments": { "typename": "virt-5.0-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21373,12 +21357,12 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21574,24 +21558,24 @@ "static": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21599,12 +21583,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22762,12 +22746,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -22845,12 +22829,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -22866,7 +22850,7 @@ "kernel": false } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -22877,7 +22861,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -22908,7 +22892,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies index bf531c9a24..ebf24c0451 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies @@ -18164,28 +18164,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18356,7 +18340,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18364,7 +18348,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18541,7 +18525,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18549,7 +18533,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18677,7 +18661,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18685,11 +18669,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -18701,11 +18685,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -18717,11 +18701,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -18733,7 +18717,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18828,7 +18812,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18836,11 +18820,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18852,7 +18836,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18947,7 +18931,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18955,7 +18939,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19008,7 +18992,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19016,7 +19000,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19222,7 +19206,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19230,7 +19214,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19308,7 +19292,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19316,11 +19300,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -19332,7 +19316,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19535,7 +19519,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19543,11 +19527,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19559,7 +19543,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19640,7 +19624,7 @@ "type": "int" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19648,7 +19632,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19741,7 +19725,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19749,7 +19733,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19830,7 +19814,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19838,7 +19822,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19880,7 +19864,7 @@ "type": "uint64" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19888,7 +19872,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20009,7 +19993,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20017,7 +20001,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20111,7 +20095,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20119,7 +20103,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20195,7 +20179,7 @@ "type": "uint16" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20203,7 +20187,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20273,7 +20257,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20281,7 +20265,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20350,12 +20334,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20625,7 +20609,7 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20633,7 +20617,7 @@ "arguments": { "typename": "pseries-5.0-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20842,12 +20826,12 @@ "type": "string" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23053,24 +23037,24 @@ "static": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-spapr" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -23078,12 +23062,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24220,12 +24204,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24303,7 +24287,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies index 280e1b7556..097855e657 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies @@ -16410,28 +16410,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16602,7 +16586,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -16610,7 +16594,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16787,7 +16771,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -16795,7 +16779,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16923,7 +16907,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -16931,11 +16915,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -16947,7 +16931,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -17005,7 +16989,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -17013,11 +16997,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -17029,11 +17013,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -17045,7 +17029,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17140,7 +17124,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -17148,11 +17132,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -17164,7 +17148,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17259,7 +17243,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -17267,7 +17251,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17320,7 +17304,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -17328,7 +17312,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17546,7 +17530,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -17554,7 +17538,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17644,7 +17628,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -17652,11 +17636,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -17668,7 +17652,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17871,7 +17855,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17879,11 +17863,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -17895,7 +17879,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17976,7 +17960,7 @@ "type": "guest statistics" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17984,7 +17968,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18077,7 +18061,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -18085,7 +18069,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18206,7 +18190,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -18214,7 +18198,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18308,7 +18292,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -18316,7 +18300,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18392,7 +18376,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18400,7 +18384,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18470,7 +18454,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -18478,7 +18462,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -18547,12 +18531,12 @@ "type": "int" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18610,7 +18594,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18618,7 +18602,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18708,34 +18692,34 @@ "type": "string" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -20001,12 +19985,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -20084,5 +20068,5 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies index 759d621517..1b566a2086 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies @@ -17522,28 +17522,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -17714,7 +17698,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -17722,7 +17706,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17899,7 +17883,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17907,7 +17891,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18035,7 +18019,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18043,7 +18027,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -18116,7 +18100,7 @@ "type": "uint8" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -18124,7 +18108,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -18182,7 +18166,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -18190,7 +18174,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18235,7 +18219,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18243,7 +18227,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18331,7 +18315,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18339,7 +18323,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18434,7 +18418,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18442,7 +18426,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18458,7 +18442,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18466,7 +18450,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18561,7 +18545,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18569,7 +18553,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18622,7 +18606,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18630,7 +18614,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18748,7 +18732,7 @@ "type": "int32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18756,7 +18740,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18974,7 +18958,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18982,7 +18966,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19072,7 +19056,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19080,7 +19064,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19182,7 +19166,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19190,7 +19174,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19393,7 +19377,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19401,11 +19385,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19417,7 +19401,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19498,7 +19482,7 @@ "type": "guest statistics" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19506,7 +19490,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19599,7 +19583,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19607,7 +19591,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19665,7 +19649,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19673,7 +19657,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19726,7 +19710,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19734,7 +19718,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19776,7 +19760,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19784,7 +19768,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19905,7 +19889,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19913,7 +19897,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20007,7 +19991,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20015,7 +19999,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20091,7 +20075,7 @@ "type": "uint16" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20099,7 +20083,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20169,7 +20153,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20177,7 +20161,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20246,7 +20230,7 @@ "type": "int" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20254,7 +20238,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21820,12 +21804,12 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22201,12 +22185,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -23751,12 +23735,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -23764,12 +23748,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -23777,12 +23761,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -25058,12 +25042,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -25141,16 +25125,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -25165,7 +25149,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -25468,7 +25452,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -25482,7 +25466,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -25785,7 +25769,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies index 928251b268..82de51cca6 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies @@ -18031,28 +18031,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18223,7 +18207,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18231,7 +18215,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18408,7 +18392,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18416,7 +18400,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18544,7 +18528,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18552,7 +18536,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -18625,7 +18609,7 @@ "type": "uint8" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -18633,7 +18617,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -18691,7 +18675,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -18699,7 +18683,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18749,7 +18733,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18757,7 +18741,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18850,7 +18834,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -18858,7 +18842,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18953,7 +18937,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18961,7 +18945,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18977,7 +18961,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -18985,7 +18969,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19080,7 +19064,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19088,7 +19072,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19141,7 +19125,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19149,7 +19133,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19267,7 +19251,7 @@ "type": "int32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19275,7 +19259,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19493,7 +19477,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -19501,7 +19485,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19591,7 +19575,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19599,7 +19583,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19701,7 +19685,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19709,7 +19693,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19924,7 +19908,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19932,11 +19916,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -19948,7 +19932,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20041,7 +20025,7 @@ "type": "guest statistics" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20049,7 +20033,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20142,7 +20126,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20150,7 +20134,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20208,7 +20192,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20216,7 +20200,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20269,7 +20253,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20277,7 +20261,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20319,7 +20303,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20327,7 +20311,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20448,7 +20432,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20456,7 +20440,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20554,7 +20538,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -20562,7 +20546,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20638,7 +20622,7 @@ "type": "uint16" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -20646,7 +20630,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20716,7 +20700,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -20724,7 +20708,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20793,7 +20777,7 @@ "type": "int" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20801,7 +20785,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22387,12 +22371,12 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -22784,12 +22768,12 @@ "deprecated": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24491,12 +24475,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24504,12 +24488,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24517,12 +24501,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -25817,12 +25801,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -25900,16 +25884,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -25924,7 +25908,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -26232,7 +26216,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -26246,7 +26230,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -26554,7 +26538,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies index 163fed18c3..91373dc52e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies @@ -19517,28 +19517,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -19720,7 +19704,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -19728,7 +19712,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -19905,7 +19889,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -19913,7 +19897,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -20041,7 +20025,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -20049,11 +20033,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -20065,11 +20049,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -20081,11 +20065,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -20097,7 +20081,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20196,7 +20180,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20204,11 +20188,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -20220,7 +20204,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20315,7 +20299,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -20323,7 +20307,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -20376,7 +20360,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -20384,7 +20368,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20595,7 +20579,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20603,7 +20587,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20686,7 +20670,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20694,11 +20678,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20710,7 +20694,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20930,7 +20914,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20938,11 +20922,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20954,7 +20938,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21052,7 +21036,7 @@ "type": "int" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21060,7 +21044,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21161,7 +21145,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21169,7 +21153,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21211,7 +21195,7 @@ "type": "uint64" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21219,7 +21203,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21340,7 +21324,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21348,7 +21332,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21446,7 +21430,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21454,7 +21438,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21530,7 +21514,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21538,7 +21522,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21608,7 +21592,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21616,7 +21600,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21685,7 +21669,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21693,7 +21677,7 @@ "arguments": { "typename": "max-arm-cpu" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21902,12 +21886,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22644,7 +22628,7 @@ "deprecated": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22652,7 +22636,7 @@ "arguments": { "typename": "virt-5.2-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22815,12 +22799,12 @@ "type": "child<cfi.pflash01>" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23054,24 +23038,24 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -23079,12 +23063,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -24261,12 +24245,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -24344,12 +24328,12 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24365,7 +24349,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -24376,7 +24360,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -24408,7 +24392,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies index 32ae212753..2ce594d46d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies @@ -19164,28 +19164,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -19367,7 +19351,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -19375,7 +19359,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -19552,7 +19536,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -19560,7 +19544,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -19688,7 +19672,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -19696,11 +19680,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -19712,11 +19696,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -19728,11 +19712,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -19744,7 +19728,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19843,7 +19827,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19851,11 +19835,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19867,7 +19851,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19962,7 +19946,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19970,7 +19954,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -20023,7 +20007,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -20031,7 +20015,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20242,7 +20226,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20250,7 +20234,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20333,7 +20317,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -20341,11 +20325,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20357,7 +20341,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20577,7 +20561,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20585,11 +20569,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20601,7 +20585,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20699,7 +20683,7 @@ "type": "int" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20707,7 +20691,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20808,7 +20792,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20816,7 +20800,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20907,7 +20891,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20915,7 +20899,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20957,7 +20941,7 @@ "type": "uint64" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20965,7 +20949,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21086,7 +21070,7 @@ "type": "PCIELinkSpeed" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21094,7 +21078,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21192,7 +21176,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21200,7 +21184,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21276,7 +21260,7 @@ "type": "uint16" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21284,7 +21268,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21354,7 +21338,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21362,7 +21346,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21431,12 +21415,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21756,7 +21740,7 @@ "default-ram-id": "mpc8544ds.ram" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21764,7 +21748,7 @@ "arguments": { "typename": "pseries-5.2-machine" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21968,12 +21952,12 @@ "type": "string" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -24619,24 +24603,24 @@ "deprecated": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "tpm-spapr" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -24644,12 +24628,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -25805,12 +25789,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -25888,7 +25872,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies index 469da0f90c..a733fc36bd 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies @@ -17395,28 +17395,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -17598,7 +17582,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -17606,7 +17590,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17783,7 +17767,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -17791,7 +17775,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -17919,7 +17903,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -17927,11 +17911,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -17943,7 +17927,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -18001,7 +17985,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -18009,11 +17993,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -18025,11 +18009,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -18041,7 +18025,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18140,7 +18124,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -18148,11 +18132,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18164,7 +18148,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18259,7 +18243,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18267,7 +18251,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18320,7 +18304,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18328,7 +18312,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18551,7 +18535,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -18559,7 +18543,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18654,7 +18638,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18662,11 +18646,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18678,7 +18662,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18898,7 +18882,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -18906,11 +18890,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -18922,7 +18906,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19020,7 +19004,7 @@ "type": "guest statistics" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19028,7 +19012,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19129,7 +19113,7 @@ "type": "child<base-xhci>" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19137,7 +19121,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19258,7 +19242,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19266,7 +19250,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19364,7 +19348,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19372,7 +19356,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19448,7 +19432,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19456,7 +19440,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19526,7 +19510,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19534,7 +19518,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -19603,12 +19587,12 @@ "type": "int" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19662,7 +19646,7 @@ "deprecated": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19670,7 +19654,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -19760,34 +19744,34 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21072,12 +21056,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -21155,5 +21139,5 @@ "capability": "validate-uuid" } ], - "id": "libvirt-42" + "id": "libvirt-41" } diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies index bdf1bc3b3d..74fcf04aa8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies @@ -17853,28 +17853,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18056,7 +18040,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18064,7 +18048,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18241,7 +18225,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -18249,11 +18233,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-hd' not found" @@ -18265,11 +18249,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -18281,7 +18265,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18339,7 +18323,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -18347,11 +18331,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -18363,11 +18347,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -18379,11 +18363,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -18395,7 +18379,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18618,7 +18602,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -18626,7 +18610,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18721,7 +18705,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -18729,11 +18713,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -18745,7 +18729,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18965,7 +18949,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -18973,7 +18957,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19101,7 +19085,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -19109,7 +19093,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19207,7 +19191,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -19215,7 +19199,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19340,7 +19324,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19348,7 +19332,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19364,7 +19348,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19372,11 +19356,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -19388,7 +19372,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19464,7 +19448,7 @@ "type": "uint16" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19472,7 +19456,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19542,7 +19526,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19550,7 +19534,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19619,12 +19603,12 @@ "type": "int" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -19793,12 +19777,12 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -20479,34 +20463,34 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21662,12 +21646,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21745,7 +21729,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21756,7 +21740,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -21812,7 +21796,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies index 45d7dc1682..ef531340b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies @@ -18562,28 +18562,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18765,7 +18749,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -18773,7 +18757,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18950,7 +18934,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -18958,7 +18942,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -19086,7 +19070,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -19094,7 +19078,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -19172,7 +19156,7 @@ "type": "uint8" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -19180,7 +19164,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -19238,7 +19222,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -19246,7 +19230,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19296,7 +19280,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19304,7 +19288,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19397,7 +19381,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -19405,7 +19389,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19504,7 +19488,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -19512,7 +19496,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19528,7 +19512,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -19536,7 +19520,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19631,7 +19615,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -19639,7 +19623,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19692,7 +19676,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -19700,7 +19684,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19818,7 +19802,7 @@ "type": "int32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -19826,7 +19810,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20049,7 +20033,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20057,7 +20041,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20152,7 +20136,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20160,7 +20144,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20278,7 +20262,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20286,7 +20270,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20506,7 +20490,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20514,11 +20498,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -20530,7 +20514,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20628,7 +20612,7 @@ "type": "guest statistics" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -20636,7 +20620,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20737,7 +20721,7 @@ "type": "child<base-xhci>" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -20745,7 +20729,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20803,7 +20787,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -20811,7 +20795,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20864,7 +20848,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -20872,7 +20856,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20914,7 +20898,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20922,7 +20906,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21043,7 +21027,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -21051,7 +21035,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21149,7 +21133,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -21157,7 +21141,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21233,7 +21217,7 @@ "type": "uint16" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21241,7 +21225,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21311,7 +21295,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21319,7 +21303,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21388,7 +21372,7 @@ "type": "int" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21396,7 +21380,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -22994,12 +22978,12 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -23457,12 +23441,12 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -25287,12 +25271,12 @@ "deprecated": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -25300,12 +25284,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -25313,12 +25297,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -26613,12 +26597,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -26696,16 +26680,16 @@ "capability": "validate-uuid" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -26720,7 +26704,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -27029,7 +27013,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -27043,7 +27027,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -27352,7 +27336,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies index 2f832b9162..473631af84 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies @@ -19440,28 +19440,12 @@ "id": "libvirt-13" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-14" -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -19653,7 +19637,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -19661,7 +19645,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -19838,7 +19822,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -19846,11 +19830,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-hd' not found" @@ -19862,11 +19846,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -19878,7 +19862,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19934,7 +19918,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -19942,11 +19926,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -19958,11 +19942,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -19974,11 +19958,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -19990,7 +19974,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -20235,7 +20219,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -20243,7 +20227,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20338,7 +20322,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -20346,11 +20330,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -20362,7 +20346,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20599,7 +20583,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -20607,7 +20591,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20735,7 +20719,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -20743,7 +20727,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20841,7 +20825,7 @@ "type": "guest statistics" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -20849,7 +20833,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20974,7 +20958,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -20982,7 +20966,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -20998,7 +20982,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21006,11 +20990,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -21022,7 +21006,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21102,7 +21086,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21110,7 +21094,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21180,7 +21164,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21188,7 +21172,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21257,12 +21241,12 @@ "type": "int" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -21440,12 +21424,12 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22126,34 +22110,34 @@ "deprecated": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23329,12 +23313,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23416,7 +23400,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23427,7 +23411,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -23484,7 +23468,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies index 58b2cd8590..3e059ae5ec 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies @@ -20187,28 +20187,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -20400,7 +20384,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -20408,7 +20392,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -20585,7 +20569,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -20593,7 +20577,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -20721,7 +20705,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -20729,7 +20713,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -20822,7 +20806,7 @@ "type": "uint8" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -20830,7 +20814,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -20886,7 +20870,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -20894,7 +20878,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20944,7 +20928,7 @@ "type": "child<memory-region>" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20952,7 +20936,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21045,7 +21029,7 @@ "type": "child<memory-region>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -21053,7 +21037,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21150,7 +21134,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21158,7 +21142,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21174,7 +21158,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21182,7 +21166,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21287,7 +21271,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21295,7 +21279,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21358,7 +21342,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21366,7 +21350,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21494,7 +21478,7 @@ "type": "int32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21502,7 +21486,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21747,7 +21731,7 @@ "type": "child<virtio-gpu-device>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21755,7 +21739,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21850,7 +21834,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21858,7 +21842,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21991,7 +21975,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21999,7 +21983,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22236,7 +22220,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22244,11 +22228,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22260,7 +22244,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22358,7 +22342,7 @@ "type": "guest statistics" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22366,7 +22350,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22477,7 +22461,7 @@ "type": "child<base-xhci>" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22485,7 +22469,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22543,7 +22527,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22551,7 +22535,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22614,7 +22598,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22622,7 +22606,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22664,7 +22648,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22672,7 +22656,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22803,7 +22787,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22811,7 +22795,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -22907,7 +22891,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -22915,7 +22899,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22995,7 +22979,7 @@ "type": "int32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23003,7 +22987,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23077,7 +23061,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23085,7 +23069,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23154,7 +23138,7 @@ "type": "int" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23162,7 +23146,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -24808,12 +24792,12 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -25260,12 +25244,12 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27133,12 +27117,12 @@ "deprecated": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27146,12 +27130,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -27159,12 +27143,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -28483,12 +28467,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -28570,16 +28554,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -28594,7 +28578,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -28915,7 +28899,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -28929,7 +28913,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -29250,7 +29234,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies index 186cf4c1ee..1f38155c08 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies @@ -20057,28 +20057,12 @@ } } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtio-net-s390" - }, - "id": "libvirt-13" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - { "execute": "device-list-properties", "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -20270,7 +20254,7 @@ "type": "int32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -20278,7 +20262,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -20455,7 +20439,7 @@ "type": "int32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -20463,7 +20447,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -20591,7 +20575,7 @@ "type": "int32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -20599,7 +20583,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -20692,7 +20676,7 @@ "type": "uint8" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -20700,7 +20684,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -20756,7 +20740,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -20764,7 +20748,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20814,7 +20798,7 @@ "type": "child<memory-region>" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -20822,7 +20806,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20915,7 +20899,7 @@ "type": "child<memory-region>" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -20923,7 +20907,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21020,7 +21004,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -21028,7 +21012,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21044,7 +21028,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -21052,7 +21036,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21162,7 +21146,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -21170,7 +21154,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21233,7 +21217,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -21241,7 +21225,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21369,7 +21353,7 @@ "type": "int32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -21377,7 +21361,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21610,7 +21594,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -21618,7 +21602,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21701,7 +21685,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -21709,7 +21693,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21842,7 +21826,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -21850,7 +21834,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22087,7 +22071,7 @@ "type": "child<virtio-balloon-device>" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -22095,11 +22079,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -22111,7 +22095,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22209,7 +22193,7 @@ "type": "guest statistics" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -22217,7 +22201,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22328,7 +22312,7 @@ "type": "child<base-xhci>" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -22336,7 +22320,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22394,7 +22378,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -22402,7 +22386,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22465,7 +22449,7 @@ "type": "uint16" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -22473,7 +22457,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22515,7 +22499,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22523,7 +22507,7 @@ "arguments": { "typename": "pcie-root-port" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22654,7 +22638,7 @@ "type": "size" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -22662,7 +22646,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -22758,7 +22742,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -22766,7 +22750,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22846,7 +22830,7 @@ "type": "int32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -22854,7 +22838,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22928,7 +22912,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -22936,7 +22920,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23005,7 +22989,7 @@ "type": "int" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23013,7 +22997,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -24659,12 +24643,12 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -25129,12 +25113,12 @@ "default-ram-id": "pc.ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -27002,12 +26986,12 @@ "deprecated": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -27015,12 +26999,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -27028,12 +27012,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -28352,12 +28336,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -28439,16 +28423,16 @@ "capability": "background-snapshot" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -28463,7 +28447,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -28784,7 +28768,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -28798,7 +28782,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -29119,7 +29103,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { -- 2.31.1
Give the test QEMU_CAPS_CCW instead of QEMU_CAPS_VIRTIO_S390 since the latter can never be asserted any more. This preserves what the tests wants to check so that QEMU_CAPS_VIRTIO_S390 can be removed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8e84734e61..119bd94418 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1345,8 +1345,7 @@ mymain(void) QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("non-x86_64-timer-error", - QEMU_CAPS_VIRTIO_S390); + DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); -- 2.31.1
QEMU_CAPS_VIRTIO_S390 can never be asserted any more, add an explicit check that will reject the 'virtio-s390' address type and remove the code which would auto-fill them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain_address.c | 5 ----- src/qemu/qemu_validate.c | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 10cf5eb6f4..93942be559 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -421,9 +421,6 @@ qemuDomainAssignS390Addresses(virDomainDef *def, if (!(addrs = virDomainCCWAddressSetCreateFromDomain(def))) goto cleanup; - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { - /* deal with legacy virtio-s390 */ - qemuDomainPrimeVirtioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390); } ret = 0; @@ -3271,8 +3268,6 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, if (qemuDomainIsS390CCW(vm->def) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; - else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) - info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; } else { if (!qemuDomainCheckCCWS390AddressSupport(vm->def, info, priv->qemuCaps, devicename)) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 669c45b3c5..16f77611c8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1309,11 +1309,15 @@ qemuValidateDomainDeviceDefAddress(const virDomainDeviceDef *dev, break; } + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'virtio-s390' addresses are no longer supported")); + return -1; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: -- 2.31.1
Modify the code in the last two instances in the code to behave as if the flag is not asserted. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 10 ++++------ src/qemu/qemu_hotplug.c | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 18b5403974..d0dd1ce995 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10666,12 +10666,10 @@ qemuDomainCheckCCWS390AddressSupport(const virDomainDef *def, return false; } } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio S390 address type is not supported by " - "this QEMU")); - return false; - } + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio S390 address type is not supported by " + "this QEMU")); + return false; } return true; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0640cdd9f7..38eca0144d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1246,10 +1246,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (virDomainCCWAddressAssign(&net->info, ccwaddrs, !net->info.addr.ccw.assigned) < 0) goto cleanup; - } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-s390 net device cannot be hotplugged.")); - goto cleanup; } else if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) { goto cleanup; } -- 2.31.1
The flag isn't used by the code in any way so it can be dropped from the legacy test cases. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvtest.c | 92 ++++++++++++++-------------------------- tests/qemuxml2xmltest.c | 24 ++++------- 2 files changed, 41 insertions(+), 75 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 119bd94418..1345c42b72 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1337,14 +1337,9 @@ mymain(void) QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("disk-floppy-tray", NONE); DO_TEST("disk-virtio", NONE); - DO_TEST("disk-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("disk-virtio-ccw-many", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("disk-virtio-s390-zpci", - QEMU_CAPS_DEVICE_ZPCI, - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); + DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW); + DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-virtio-queues", @@ -1631,8 +1626,7 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-disable-offloads", NONE); DO_TEST("net-virtio-netdev", NONE); - DO_TEST("net-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW); DO_TEST("net-virtio-rxtxqueuesize", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); @@ -1751,9 +1745,7 @@ mymain(void) DO_TEST("console-virtio", NONE); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-virtio-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); + DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW); DO_TEST_CAPS_LATEST("console-virtio-unix"); DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x"); DO_TEST("channel-spicevmc", @@ -1917,8 +1909,7 @@ mymain(void) QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", NONE); DO_TEST_CAPS_LATEST("fs9p"); - DO_TEST("fs9p-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("fs9p-ccw", QEMU_CAPS_CCW); DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x"); DO_TEST("hostdev-usb-address", NONE); @@ -2051,7 +2042,7 @@ mymain(void) DO_TEST_FAILURE("iothreads-nocap", NONE); DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0"); DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); @@ -2089,7 +2080,7 @@ mymain(void) DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_S390X); - DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW); DO_TEST("cpu-s390-features", QEMU_CAPS_KVM, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION); DO_TEST_FAILURE("cpu-s390-features", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_NONE); @@ -2535,37 +2526,23 @@ mymain(void) QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST("virtio-rng-ccw", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); - DO_TEST("s390-panic-no-address", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("s390-panic-address", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-panic-missing", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("s390-no-parallel", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); + DO_TEST_PARSE_ERROR("s390-panic-address", QEMU_CAPS_CCW); + DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); + DO_TEST_PARSE_ERROR("s390-no-parallel", QEMU_CAPS_CCW); + DO_TEST("s390-serial", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("s390-serial-2", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE, QEMU_CAPS_DEVICE_SCLPLMCONSOLE); DO_TEST("s390-serial-console", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("ppc-dtb", @@ -3146,92 +3123,89 @@ mymain(void) QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-on-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-on-cap", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-on-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-off-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-off-cap", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-off-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-on-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-on-cap", QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-on-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-off-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-off-cap", QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-off-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-keywrap-none-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-keywrap-none", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-loadparm-s390", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390, + QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-net-s390", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390, + QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-multiple-disks-nets-s390", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_LOADPARM); DO_TEST("qemu-ns-domain-ns0", NONE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 664cfbd3ba..fc599e132b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -565,13 +565,11 @@ mymain(void) DO_TEST("iothreads-ids-partial", NONE); DO_TEST("cputune-iothreads", NONE); DO_TEST("iothreads-disk", NONE); - DO_TEST("iothreads-disk-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_CCW); DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("iothreads-virtio-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); DO_TEST("lease", NONE); DO_TEST("event_idx", NONE); DO_TEST("vhost_queues", NONE); @@ -1052,18 +1050,12 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_AP); DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); - DO_TEST("s390-panic", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-panic-missing", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-panic-no-address", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial-2", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial-console", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("s390-panic", QEMU_CAPS_CCW); + DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); + DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); + DO_TEST("s390-serial", QEMU_CAPS_CCW); + DO_TEST("s390-serial-2", QEMU_CAPS_CCW); + DO_TEST("s390-serial-console", QEMU_CAPS_CCW); DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE); DO_TEST("pcihole64-gib", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE); -- 2.31.1
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 94f2fad05a..27af11d0b8 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -180,7 +180,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 95 */ QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ - QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ + X_QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ X_QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ X_QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ QEMU_CAPS_SCSI_LSI, /* -device lsi */ -- 2.31.1
We don't support any qemu which would support the 'virtio-s390' addressing, thus we can drop all code related to it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 6 +----- src/qemu/qemu_domain_address.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7834fc2130..dde4c1ba4e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -524,9 +524,6 @@ qemuBuildVirtioDevStr(virBuffer *buf, break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - implName = "s390"; - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: @@ -5296,8 +5293,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, } if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { /* Check it's a virtio-serial address */ if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 93942be559..8d52f1d884 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2241,10 +2241,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, /* don't touch s390 devices */ if (virDeviceInfoPCIAddressIsPresent(&def->disks[i]->info) || - def->disks[i]->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 || - def->disks[i]->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) + def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) continue; /* Also ignore virtio-mmio disks if our machine allows them */ -- 2.31.1
Base the check on the logic from qemuDomainCheckCCWS390AddressSupport, which will be removed later. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_validate.c | 20 ++++++++++++++++++-- tests/qemuxml2argvtest.c | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 16f77611c8..b4f012253b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1276,6 +1276,7 @@ qemuValidateDomainDeviceDefZPCIAddress(virDomainDeviceInfo *info, static int qemuValidateDomainDeviceDefAddress(const virDomainDeviceDef *dev, + const virDomainDef *def, virQEMUCaps *qemuCaps) { virDomainDeviceInfo *info; @@ -1314,11 +1315,26 @@ qemuValidateDomainDeviceDefAddress(const virDomainDeviceDef *dev, _("'virtio-s390' addresses are no longer supported")); return -1; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + if (!qemuDomainIsS390CCW(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for device '%s' using machine type '%s'"), + NULLSTR(info->alias), def->os.machine); + return -1; + } + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CCW address type is not supported by this QEMU")); + return -1; + } + + break; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: @@ -5006,7 +5022,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev, qemuCaps = qemuCapsLocal; } - if ((ret = qemuValidateDomainDeviceDefAddress(dev, qemuCaps)) < 0) + if ((ret = qemuValidateDomainDeviceDefAddress(dev, def, qemuCaps)) < 0) return ret; switch ((virDomainDeviceType)dev->type) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1345c42b72..7a6ddc632c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1893,7 +1893,7 @@ mymain(void) DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST("balloon-ccw-deflate", - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); + QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, QEMU_CAPS_CCW); DO_TEST("balloon-mmio-deflate", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); -- 2.31.1
For validation of explicitly configured addresses we already ported the same style of checks to qemuValidateDomainDeviceDefAddress and implicit address assignment should do the right thing in the first place, thus the function is redundant and can be removed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 4 ---- src/qemu/qemu_domain.c | 38 ---------------------------------- src/qemu/qemu_domain.h | 6 ------ src/qemu/qemu_domain_address.c | 7 +------ src/qemu/qemu_domain_address.h | 3 +-- src/qemu/qemu_hotplug.c | 13 ++++++------ src/qemu/qemu_validate.c | 14 +------------ 7 files changed, 9 insertions(+), 76 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dde4c1ba4e..434101246b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5449,10 +5449,6 @@ qemuBuildRNGDevStr(const virDomainDef *def, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - if (!qemuDomainCheckCCWS390AddressSupport(def, &dev->info, qemuCaps, - dev->source.file)) - return NULL; - if (qemuBuildVirtioDevStr(&buf, "virtio-rng", qemuCaps, VIR_DOMAIN_DEVICE_RNG, dev) < 0) { return NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d0dd1ce995..1072996411 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10637,44 +10637,6 @@ qemuDomainGetMachineName(virDomainObj *vm) } -/* Check whether the device address is using either 'ccw' or default s390 - * address format and whether that's "legal" for the current qemu and/or - * guest os.machine type. This is the corollary to the code which doesn't - * find the address type set using an emulator that supports either 'ccw' - * or s390 and sets the address type based on the capabilities. - * - * If the address is using 'ccw' or s390 and it's not supported, generate - * an error and return false; otherwise, return true. - */ -bool -qemuDomainCheckCCWS390AddressSupport(const virDomainDef *def, - const virDomainDeviceInfo *info, - virQEMUCaps *qemuCaps, - const char *devicename) -{ - if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - if (!qemuDomainIsS390CCW(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot use CCW address type for device " - "'%s' using machine type '%s'"), - devicename, def->os.machine); - return false; - } else if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("CCW address type is not supported by " - "this QEMU")); - return false; - } - } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio S390 address type is not supported by " - "this QEMU")); - return false; - } - return true; -} - - /** * qemuDomainPrepareDiskSourceData: * diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 9cebf9e426..6ae8af7635 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -955,12 +955,6 @@ int qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt, virTristateBool *allowReboot); -bool -qemuDomainCheckCCWS390AddressSupport(const virDomainDef *def, - const virDomainDeviceInfo *info, - virQEMUCaps *qemuCaps, - const char *devicename); - void qemuDomainPrepareDiskSourceData(virDomainDiskDef *disk, virStorageSource *src); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 8d52f1d884..6cd0cb8c84 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3252,8 +3252,7 @@ qemuDomainReleaseDeviceAddress(virDomainObj *vm, int qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainObj *vm, - virDomainDeviceDef *dev, - const char *devicename) + virDomainDeviceDef *dev) { virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev); qemuDomainObjPrivate *priv = vm->privateData; @@ -3265,10 +3264,6 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, if (qemuDomainIsS390CCW(vm->def) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; - } else { - if (!qemuDomainCheckCCWS390AddressSupport(vm->def, info, priv->qemuCaps, - devicename)) - return -1; } if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 85c71bfda5..df7e7fca99 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -65,5 +65,4 @@ void qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm, int qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainObj *vm, - virDomainDeviceDef *dev, - const char *devicename); + virDomainDeviceDef *dev); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 38eca0144d..8f7ac30114 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -869,7 +869,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *driver, return -1; } - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "controller") < 0) + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; if (qemuAssignDeviceControllerAlias(vm->def, controller) < 0) @@ -1022,7 +1022,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev, disk->dst) < 0) + if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev) < 0) goto cleanup; break; @@ -2312,7 +2312,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, /* preallocate space for the device definition */ VIR_REALLOC_N(vm->def->rngs, vm->def->nrngs + 1); - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "rng") < 0) + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; if (qemuDomainNamespaceSetupRNG(vm, rng) < 0) @@ -2861,10 +2861,9 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, return -1; break; case VIR_MDEV_MODEL_TYPE_VFIO_CCW: { - const char *devName = hostdev->source.subsys.u.mdev.uuidstr; bool releaseaddr = false; - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, devName) < 0) + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; } break; case VIR_MDEV_MODEL_TYPE_LAST: @@ -3201,7 +3200,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, } if (input->bus == VIR_DOMAIN_INPUT_BUS_VIRTIO) { - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "input") < 0) + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; } else if (input->bus == VIR_DOMAIN_INPUT_BUS_USB) { if (virDomainUSBAddressEnsure(priv->usbaddrs, &input->info) < 0) @@ -3298,7 +3297,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver, return -1; } - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "vsock") < 0) + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) return -1; if (qemuAssignDeviceVsockAlias(vsock) < 0) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b4f012253b..357bb7c3fb 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2853,9 +2853,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, qemuValidateDomainDeviceDefDiskSerial(disk->serial) < 0) return -1; - if (!qemuDomainCheckCCWS390AddressSupport(def, &disk->info, qemuCaps, disk->dst)) - return -1; - if (disk->iothread && !qemuValidateDomainDeviceDefDiskIOThreads(def, disk)) return -1; @@ -3946,10 +3943,6 @@ qemuValidateDomainDeviceDefController(const virDomainControllerDef *controller, { int ret = 0; - if (!qemuDomainCheckCCWS390AddressSupport(def, &controller->info, qemuCaps, - "controller")) - return -1; - if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && !qemuValidateCheckSCSIControllerModel(qemuCaps, controller->model)) return -1; @@ -4491,7 +4484,6 @@ qemuValidateDomainDeviceDefSound(virDomainSoundDef *sound, static int qemuValidateDomainDeviceDefVsock(const virDomainVsockDef *vsock, - const virDomainDef *def, virQEMUCaps *qemuCaps) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) { @@ -4501,10 +4493,6 @@ qemuValidateDomainDeviceDefVsock(const virDomainVsockDef *vsock, return -1; } - if (!qemuDomainCheckCCWS390AddressSupport(def, &vsock->info, qemuCaps, - "vsock")) - return -1; - if (qemuValidateDomainVirtioOptions(vsock->virtio, qemuCaps) < 0) return -1; @@ -5069,7 +5057,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev, break; case VIR_DOMAIN_DEVICE_VSOCK: - ret = qemuValidateDomainDeviceDefVsock(dev->data.vsock, def, qemuCaps); + ret = qemuValidateDomainDeviceDefVsock(dev->data.vsock, qemuCaps); break; case VIR_DOMAIN_DEVICE_TPM: -- 2.31.1
IOThreads are supported with all 3 currently supported buses which can have virtio devices (PCI, CCW, MMIO) , so there's no need for this check. Additionally this check was buggy in the current location as on e.g. hotplug cases the address may not yet be assigned for the disk and thus a bogus error would be printed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1970277 Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_validate.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 357bb7c3fb..d278d4b0ed 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2428,16 +2428,8 @@ static bool qemuValidateDomainDeviceDefDiskIOThreads(const virDomainDef *def, const virDomainDiskDef *disk) { - /* Right "type" of disk" */ switch ((virDomainDiskBus)disk->bus) { case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOThreads only available for virtio pci and " - "virtio ccw disk")); - return false; - } break; case VIR_DOMAIN_DISK_BUS_IDE: -- 2.31.1
Peter Krempa <pkrempa@redhat.com> [2021-06-11, 04:48PM +0200]:
This series consists of 3 parts:
Part 1, patches 1-3:
These are fixes to the virCommand->string conversion, namely two bugs: - VIR_TEST_REGENERATE_OUTPUT would produce new files with missing end newline - memleak in bhyves xml->native conversion
Part 2, patches 4 - 21:
Removal of 's390-virtio' machine and the corresponding addressing type. This was removed in qemu 2.6. The exploration started because the last patch was for a strange reason checking the address type and I needed to know if indeed 'virtio-s390' addresses don't support iothreads. Turns out the whole thing can be deleted.
Thanks for the cleanup! I have given this a quick test and nothing popped up. I can do a proper review if you want but this will probably have to wait until end of the week.
On 6/11/21 4:48 PM, Peter Krempa wrote:
This series consists of 3 parts:
Part 1, patches 1-3:
These are fixes to the virCommand->string conversion, namely two bugs: - VIR_TEST_REGENERATE_OUTPUT would produce new files with missing end newline - memleak in bhyves xml->native conversion
Part 2, patches 4 - 21:
Removal of 's390-virtio' machine and the corresponding addressing type. This was removed in qemu 2.6. The exploration started because the last patch was for a strange reason checking the address type and I needed to know if indeed 'virtio-s390' addresses don't support iothreads. Turns out the whole thing can be deleted.
Part 3, patch 22:
Hotplug of disks with iothreads is broken because the code was moved prior to address asignment and didn't account for missing address. Let's remove the whole check as it turned out to be pointless.
Peter Krempa (22): util: command: Introduce virCommandToStringBuf qemuxml2arvtest: Ensure newline at the end of generated .args files bhyveConnectDomainXMLToNative: Fix memory leak in incorrect virCommandToString usage tests: qemuxml2argv: Modernize 'watchdog-diag288' test tests: qemuxml2argv: Modernize 'console-sclp' test tests: qemuxml2argv: Remove redundant tests for the obsolete 'virtio-390' machine tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-none' test tests: qemuxml2xml: Modernize 's390-defaultconsole' case tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-controller' test qemu: domain: Remove hack for 's390-virtio' machine tests: Remove 's390-virtio' machine caps faking qemu: capabilities: Remove probing of 'virtio-*-s390' devices qemu: capabilities: Don't probe device properties for 'virtio-*-s390' devices qemuxml2argvtest: Use other bus capability for 'non-x86_64-timer-error' case qemu: Always reject 'virtio-s390' addresses qemu: Remove last uses of QEMU_CAPS_VIRTIO_S390 qemuxml2*test: Remove QEMU_CAPS_VIRTIO_S390 flag qemu: capabilities: Retire QEMU_CAPS_VIRTIO_S390 qemu: Drop handling of devices with VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 qemuValidateDomainDeviceDefAddress: Add validation of CCW address qemuDomainCheckCCWS390AddressSupport: Remove duplicated checker qemu: validate: Don't check bus type in qemuValidateDomainDeviceDefDiskIOThreads
src/bhyve/bhyve_driver.c | 4 +- src/libvirt_private.syms | 1 +
[...]
tests/testutilsqemu.c | 2 +- tests/vircapstest.c | 4 - 74 files changed, 2562 insertions(+), 3387 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-sclp.args create mode 100644 tests/qemuxml2argvdata/console-sclp.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog-diag288.args create mode 100644 tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args rename tests/qemuxml2xmloutdata/{s390-defaultconsole.xml => s390-defaultconsole.s390x-latest.xml} (82%)
Series: Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On 6/11/21 4:48 PM, Peter Krempa wrote:
This series consists of 3 parts:
Part 1, patches 1-3:
These are fixes to the virCommand->string conversion, namely two bugs: - VIR_TEST_REGENERATE_OUTPUT would produce new files with missing end newline - memleak in bhyves xml->native conversion
Part 2, patches 4 - 21:
Removal of 's390-virtio' machine and the corresponding addressing type. This was removed in qemu 2.6. The exploration started because the last patch was for a strange reason checking the address type and I needed to know if indeed 'virtio-s390' addresses don't support iothreads. Turns out the whole thing can be deleted.
Part 3, patch 22:
Hotplug of disks with iothreads is broken because the code was moved prior to address asignment and didn't account for missing address. Let's remove the whole check as it turned out to be pointless.
[snip] Looks good to me. A test drive also turned out fine. Therefore for all patches of the series Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com> Thanks for cleaning up. -- Mit freundlichen Grüßen/Kind regards Boris Fiuczynski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
participants (4)
-
Bjoern Walk -
Boris Fiuczynski -
Jano Tomko -
Peter Krempa