[libvirt] [PATCH v2 00/10] qemu: Get rid of QEMU_CAPS_ADD_FD (and improve block-commit probing)
Diff to v1: - stopped probing for active block-commit support when we can use QMP schema - qemuxml2argvmock's implementation of virCommandPassFD now passes through specific file descriptors and ignores the rest. Peter Krempa (10): qemu: qapi: Simplify value handling in virQEMUQAPISchemaTraverse qemu: qapi: Split up virQEMUQAPISchemaObjectGetType qemu: qapi: Allow selecting specifically optional schema entries in virQEMUQAPISchemaTraverse qemu: capabilities: Detect active block commit via QMP schema probing if possible FIXUP: regenerate ordering in replies files tests: qemuxml2argvmock: Allow 'safe' file descriptors in mocked virCommandPassFD qemu: command: Extract opening of TPM backend FDs for mocking purposes tests: qemuxml2argv: modernize TPM passthrough tests qemu: capabilities: Always assume QEMU_CAPS_ADD_FD FIXUP: regenerate ordering in replies files src/qemu/qemu_capabilities.c | 25 +-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 69 ++++--- src/qemu/qemu_command.h | 7 + src/qemu/qemu_qapi.c | 84 ++++++-- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.aarch64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 213 +++++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 185 +++++++---------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 213 +++++++++---------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- .../caps_2.12.0.aarch64.replies | 189 +++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 189 +++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 193 ++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 225 +++++++++------------ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 181 ++++++++--------- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.aarch64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 173 +++++++--------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 213 +++++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 189 +++++++---------- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 225 +++++++++------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 5 +- tests/qemuxml2argvdata/tpm-passthrough.args | 5 +- tests/qemuxml2argvmock.c | 38 +++- 64 files changed, 2415 insertions(+), 3204 deletions(-) -- 2.16.2
Introduce a few variables so that we can easily access the modifier character and also don't have to do pointer aritmetics when selecting the schema entries. This will simplify adding of new modifier characters. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_qapi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index d277ef1bde..fea6683336 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -25,6 +25,8 @@ #include "virerror.h" #include "virlog.h" +#include "c-ctype.h" + #define VIR_FROM_THIS VIR_FROM_QEMU VIR_LOG_INIT("qemu.qemu_qapi"); @@ -75,6 +77,8 @@ virQEMUQAPISchemaTraverse(const char *baseName, { virJSONValuePtr base; const char *metatype; + const char *querystr; + char modifier; while (1) { if (!(base = virHashLookup(schema, baseName))) @@ -93,13 +97,19 @@ virQEMUQAPISchemaTraverse(const char *baseName, continue; } else if (STREQ(metatype, "object")) { - if (**query == '+') + querystr = *query; + modifier = **query; + + if (!c_isalpha(modifier)) + querystr++; + + if (modifier == '+') baseName = virQEMUQAPISchemaObjectGetType("variants", - *query + 1, + querystr, "case", base); else baseName = virQEMUQAPISchemaObjectGetType("members", - *query, + querystr, "name", base); if (!baseName) @@ -139,6 +149,9 @@ virQEMUQAPISchemaTraverse(const char *baseName, * +variant_discriminator: In the case of unionized objects, select a * specific case to introspect. * + * If the name of any (sub)attribute starts with non-alphabetical symbols it + * needs to be prefixed by a single space. + * * Array types are automatically flattened to the singular type. Alternate * types are currently not supported. * -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Introduce a few variables so that we can easily access the modifier character and also don't have to do pointer aritmetics when selecting
arithmetic
the schema entries. This will simplify adding of new modifier characters.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_qapi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John
Split it into a function that returns the whole schema entry so that we can do additional checks and a helper getting the type string from the schema entry. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_qapi.c | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index fea6683336..cd28c69a96 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -33,24 +33,23 @@ VIR_LOG_INIT("qemu.qemu_qapi"); /** - * virQEMUQAPISchemaObjectGetType: + * virQEMUQAPISchemaObjectGet: * @field: name of the object containing the requested type * @name: name of the requested type * @namefield: name of the object property holding @name * * Helper that selects the type of a QMP schema object member or it's variant - * member. Returns the type string on success or NULL on error. + * member. Returns the QMP entry on success or NULL on error. */ -static const char * -virQEMUQAPISchemaObjectGetType(const char *field, - const char *name, - const char *namefield, - virJSONValuePtr elem) +static virJSONValuePtr +virQEMUQAPISchemaObjectGet(const char *field, + const char *name, + const char *namefield, + virJSONValuePtr elem) { virJSONValuePtr arr; virJSONValuePtr cur; const char *curname; - const char *type; size_t i; if (!(arr = virJSONValueObjectGetArray(elem, field))) @@ -58,18 +57,48 @@ virQEMUQAPISchemaObjectGetType(const char *field, for (i = 0; i < virJSONValueArraySize(arr); i++) { if (!(cur = virJSONValueArrayGet(arr, i)) || - !(curname = virJSONValueObjectGetString(cur, namefield)) || - !(type = virJSONValueObjectGetString(cur, "type"))) + !(curname = virJSONValueObjectGetString(cur, namefield))) continue; if (STREQ(name, curname)) - return type; + return cur; } return NULL; } +static const char * +virQEMUQAPISchemaTypeFromObject(virJSONValuePtr obj) +{ + if (!obj) + return NULL; + + return virJSONValueObjectGetString(obj, "type"); +} + + +/** + * virQEMUQAPISchemaObjectGetType: + * @field: name of the object containing the requested type + * @name: name of the requested type + * @namefield: name of the object property holding @name + * + * Helper that selects the type of a QMP schema object member or it's variant + * member. Returns the type string on success or NULL on error. + */ +static const char * +virQEMUQAPISchemaObjectGetType(const char *field, + const char *name, + const char *namefield, + virJSONValuePtr elem) +{ + virJSONValuePtr obj = virQEMUQAPISchemaObjectGet(field, name, namefield, elem); + + return virQEMUQAPISchemaTypeFromObject(obj); +} + + static virJSONValuePtr virQEMUQAPISchemaTraverse(const char *baseName, char **query, -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Split it into a function that returns the whole schema entry so that we can do additional checks and a helper getting the type string from the schema entry.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_qapi.c | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 11 deletions(-)
With pointed out nits below handled.. Reviewed-by: John Ferlan <jferlan@redhat.com> John
diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index fea6683336..cd28c69a96 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -33,24 +33,23 @@ VIR_LOG_INIT("qemu.qemu_qapi");
/** - * virQEMUQAPISchemaObjectGetType: + * virQEMUQAPISchemaObjectGet: * @field: name of the object containing the requested type * @name: name of the requested type * @namefield: name of the object property holding @name
existing, but @elem isn't described
* * Helper that selects the type of a QMP schema object member or it's variant - * member. Returns the type string on success or NULL on error. + * member. Returns the QMP entry on success or NULL on error. */ -static const char * -virQEMUQAPISchemaObjectGetType(const char *field, - const char *name, - const char *namefield, - virJSONValuePtr elem)
[...]
+/** + * virQEMUQAPISchemaObjectGetType: + * @field: name of the object containing the requested type + * @name: name of the requested type + * @namefield: name of the object property holding @name
@elem not described
+ * + * Helper that selects the type of a QMP schema object member or it's variant + * member. Returns the type string on success or NULL on error. + */ +static const char * +virQEMUQAPISchemaObjectGetType(const char *field, + const char *name, + const char *namefield, + virJSONValuePtr elem) +{ + virJSONValuePtr obj = virQEMUQAPISchemaObjectGet(field, name, namefield, elem); + + return virQEMUQAPISchemaTypeFromObject(obj); +} + + static virJSONValuePtr virQEMUQAPISchemaTraverse(const char *baseName, char **query,
Add a new modifier character which will select given schema entry only when it is optional. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_qapi.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index cd28c69a96..070379b335 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -105,6 +105,7 @@ virQEMUQAPISchemaTraverse(const char *baseName, virHashTablePtr schema) { virJSONValuePtr base; + virJSONValuePtr obj; const char *metatype; const char *querystr; char modifier; @@ -132,14 +133,20 @@ virQEMUQAPISchemaTraverse(const char *baseName, if (!c_isalpha(modifier)) querystr++; - if (modifier == '+') + if (modifier == '+') { baseName = virQEMUQAPISchemaObjectGetType("variants", querystr, "case", base); - else - baseName = virQEMUQAPISchemaObjectGetType("members", - querystr, - "name", base); + } else { + obj = virQEMUQAPISchemaObjectGet("members", querystr, + "name", base); + + if (modifier == '*' && + !virJSONValueObjectHasKey(obj, "default")) + return NULL; + + baseName = virQEMUQAPISchemaTypeFromObject(obj); + } if (!baseName) return NULL; @@ -175,6 +182,7 @@ virQEMUQAPISchemaTraverse(const char *baseName, * attribute: selects whether arguments or return type should be introspected * ("arg-type" or "ret-type" for commands, "arg-type" for events) * subattribute: specifies member name of object types + * *subattribute: same as above but must be optional * +variant_discriminator: In the case of unionized objects, select a * specific case to introspect. * -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Add a new modifier character which will select given schema entry only when it is optional.
So when the object has a "*" modifier, then we need to ...? And the check for the "default" key means what? Is it only ever present when "*" is the modifier? I bet I learn in subsequent patches, but I'm going 1 by 1.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_qapi.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
Please just fill in the above details - as it's not "obvious" to this reader, but I don't believe the code is wrong, so... Reviewed-by: John Ferlan <jferlan@redhat.com> John
For versions where we can probe that the arguments are optional we can perform the probing by a schema query rather than sending a separate command to do so. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 8 +++++--- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +- 47 files changed, 28 insertions(+), 394 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e6e199b2c6..755a666ab1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1306,6 +1306,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS }, { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, + { "block-commit/arg-type/*top", QEMU_CAPS_ACTIVE_COMMIT }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; @@ -2138,9 +2139,10 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, VIR_FORCE_CLOSE(fd); } - /* Probe for active commit of qemu 2.1 (for now, we are choosing - * to ignore the fact that qemu 2.0 can also do active commit) */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && + /* Probe for active commit of qemu 2.1. We don't need to query directly + * if we have QMP schema support */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && qemuMonitorSupportsActiveCommit(mon)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT); diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 4bc6433601..e9712caad0 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -507,22 +507,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 078507f57d..97318fa72f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -161,7 +161,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>307647</microcodeVersion> + <microcodeVersion>307434</microcodeVersion> <package> (v2.10.0)</package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index a3a4deb87d..12c7611891 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -504,22 +504,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 75c2230b25..35b79569dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -160,7 +160,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>386992</microcodeVersion> + <microcodeVersion>386779</microcodeVersion> <package> (v2.10.0)</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 4feada0473..6dc6a96d8d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -516,22 +516,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 5d134f4708..a763a9e9be 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -121,7 +121,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>307899</microcodeVersion> + <microcodeVersion>307686</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index aee8d1a2c2..d9c59b04c7 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -513,22 +513,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index e5905d727c..8ca64d6178 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -205,7 +205,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>367995</microcodeVersion> + <microcodeVersion>367782</microcodeVersion> <package> (v2.10.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 2b03c251fc..c9057fcea3 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -525,22 +525,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index df70c7d3e9..79656e6b95 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -128,7 +128,7 @@ <flag name='egl-headless'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>346751</microcodeVersion> + <microcodeVersion>346538</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index bfa7adc988..96d03d256d 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -522,22 +522,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index c22d8507a6..69f3f2c82f 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -209,7 +209,7 @@ <flag name='egl-headless'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>371455</microcodeVersion> + <microcodeVersion>371242</microcodeVersion> <package> (v2.11.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 9a8e54c63d..17c7b3f34f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -540,22 +540,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 72407c9990..926db70f80 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -172,7 +172,7 @@ <flag name='vfio-pci.display'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>347550</microcodeVersion> + <microcodeVersion>347337</microcodeVersion> <package>v2.12.0-rc0</package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 4f819150fe..a6365cf43c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -537,22 +537,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index d94082600f..66a77638a5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -170,7 +170,7 @@ <flag name='vfio-pci.display'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>428334</microcodeVersion> + <microcodeVersion>428121</microcodeVersion> <package>v2.12.0-rc0</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 0a028a2fe6..ec84f16d31 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -549,22 +549,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index e5b7ffc433..f7c54df0d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -136,7 +136,7 @@ <flag name='vfio-pci.display'/> <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>375999</microcodeVersion> + <microcodeVersion>375786</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 6f37e4301e..95e8ef1174 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -555,22 +555,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index d34d762ca8..8453883fe8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -214,7 +214,7 @@ <flag name='vfio-pci.display'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>416196</microcodeVersion> + <microcodeVersion>415983</microcodeVersion> <package>v2.12.0-rc0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 20d0000c84..c1a124adf2 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -471,22 +471,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 1055b367fb..ffa2b87f8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -164,7 +164,7 @@ <flag name='mch'/> <version>2005000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>221513</microcodeVersion> + <microcodeVersion>221300</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index fd08db576a..ec0cc7e55e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -474,22 +474,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 31f78d3a7a..70b5c4896f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -145,7 +145,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>232358</microcodeVersion> + <microcodeVersion>232145</microcodeVersion> <package></package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 4406214e62..c803001670 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -471,22 +471,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index be091167d3..0155c85971 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -140,7 +140,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>267184</microcodeVersion> + <microcodeVersion>266971</microcodeVersion> <package></package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index c8b8f44e95..9733d48be6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -477,22 +477,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index ea2623c9ef..e7bf91cc64 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -176,7 +176,7 @@ <flag name='mch'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>232317</microcodeVersion> + <microcodeVersion>232104</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index f92b8f9803..621aea5896 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -483,22 +483,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index adc3877bd8..459f2da46c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -108,7 +108,7 @@ <flag name='sdl-gl'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>220792</microcodeVersion> + <microcodeVersion>220579</microcodeVersion> <package></package> <arch>s390x</arch> <cpu type='kvm' name='host'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 89ad92f3ea..4f7be9337f 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -486,22 +486,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 00557a9783..defd5554e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -181,7 +181,7 @@ <flag name='mch'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>244005</microcodeVersion> + <microcodeVersion>243792</microcodeVersion> <package> (v2.7.0)</package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 135f22ab89..52de79df75 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -495,22 +495,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index fdaea3fabb..564c6c481a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -111,7 +111,7 @@ <flag name='vhost-vsock'/> <version>2007093</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>246206</microcodeVersion> + <microcodeVersion>245993</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='zEC12.2-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index 8f80e733db..e0783e7e7e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -489,22 +489,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 71548b6326..318059bba1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -184,7 +184,7 @@ <flag name='mch'/> <version>2008000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>260660</microcodeVersion> + <microcodeVersion>260447</microcodeVersion> <package> (v2.8.0)</package> <arch>x86_64</arch> <cpu type='kvm' name='host' usable='yes'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index 0c97fc3ad8..53a3c0a580 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -495,22 +495,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c4ebb73d21..ea81b431f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -151,7 +151,7 @@ <flag name='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>350708</microcodeVersion> + <microcodeVersion>350495</microcodeVersion> <package> (v2.9.0)</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 94ab7feb62..5c28c38ccd 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -507,22 +507,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 302cc5ffa1..a1e0152f95 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -115,7 +115,7 @@ <flag name='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>269625</microcodeVersion> + <microcodeVersion>269412</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z13.2-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 7d10d68abd..a432c5b9d2 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -504,22 +504,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index c0bfb3f07a..54c4e4ce57 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -199,7 +199,7 @@ <flag name='mch'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>343984</microcodeVersion> + <microcodeVersion>343771</microcodeVersion> <package> (v2.9.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index f759823f6c..533404112c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -582,22 +582,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 64033dee51..85848ecdae 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -170,7 +170,7 @@ <flag name='vfio-pci.display'/> <version>2012050</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>446771</microcodeVersion> + <microcodeVersion>446558</microcodeVersion> <package>v2.12.0-1689-g518d23a</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index dc34d74ca3..2c822a5034 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -600,22 +600,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index c8da1c5696..02939f178f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -217,7 +217,7 @@ <flag name='vfio-pci.display'/> <version>3000000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>427797</microcodeVersion> + <microcodeVersion>427584</microcodeVersion> <package>v3.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
For versions where we can probe that the arguments are optional we can perform the probing by a schema query rather than sending a separate command to do so.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 8 +++++--- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 16 ---------------- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +- 47 files changed, 28 insertions(+), 394 deletions(-)
Until I looked at the history of qapi/block-core.json, the "*" didn't make sense. Still, it seems "top" means required argument "top" while "*top" means optional argument "top". Does that mean "theoretically speaking" we could have used "*tls-creds" since that's listed as optional for nbd-server-start? Suffice to say screendump doesn't make much sense either, although in light of this "*", perhaps it too could be "*device"? I dunno, just guessing and grousing. Different problem for a different day, but documenting the syntax of the entries in the virQEMUCapsQMPSchemaQueries would be nice. Reviewed-by: John Ferlan <jferlan@redhat.com> John
On Thu, Aug 23, 2018 at 14:45:35 -0400, John Ferlan wrote:
On 08/15/2018 05:18 AM, Peter Krempa wrote:
For versions where we can probe that the arguments are optional we can perform the probing by a schema query rather than sending a separate command to do so.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> ---
[...]
Until I looked at the history of qapi/block-core.json, the "*" didn't make sense. Still, it seems "top" means required argument "top" while "*top" means optional argument "top". Does that mean "theoretically speaking" we could have used "*tls-creds" since that's listed as optional for nbd-server-start? Suffice to say screendump doesn't make much sense either, although in light of this "*", perhaps it too could be "*device"? I dunno, just guessing and grousing.
Some of them may be selected using the '*' modifier. The modifier is meant to select optional only arguments. For arguments which are not optional or if you don't care if it's optional no modifier still should be used. This is useful only in cases where some argument became optional later on.
Different problem for a different day, but documenting the syntax of the entries in the virQEMUCapsQMPSchemaQueries would be nice.
The documentation for virQEMUCapsQMPSchemaQueries says: /* see documentation for virQEMUQAPISchemaPathGet for the query format */ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS}, Where we document the format of the query string: /** * virQEMUQAPISchemaPathGet: * @query: string specifying the required data type (see below) * @schema: hash table containing the schema data * @entry: filled with the located schema object requested by @query * * Retrieves the requested schema entry specified by @query to @entry. The * @query parameter has the following syntax which is very closely tied to the * qemu schema syntax entries separated by slashes with a few special characters: * * "command_or_event/attribute/subattribute/+variant_discriminator/subattribute" * * command_or_event: name of the event or attribute to introspect * attribute: selects whether arguments or return type should be introspected * ("arg-type" or "ret-type" for commands, "arg-type" for events) * subattribute: specifies member name of object types * *subattribute: same as above but must be optional (has a property named * 'default' field in the schema) * +variant_discriminator: In the case of unionized objects, select a * specific case to introspect. * * If the name of any (sub)attribute starts with non-alphabetical symbols it * needs to be prefixed by a single space. * * Array types are automatically flattened to the singular type. Alternate * types are currently not supported. * * The above types can be chained arbitrarily using slashes to construct any * path into the schema tree. * * Returns 0 on success (including if the requested schema was not found) and * fills @entry appropriately. On failure returns -1 and sets an appropriate * error message. */
Split up for simpler reviews. --- .../caps_2.10.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 148 ++++++++-------- .../caps_2.10.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 152 ++++++++-------- .../caps_2.11.0.x86_64.replies | 180 +++++++++---------- .../caps_2.12.0.aarch64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 160 ++++++++--------- .../caps_2.12.0.x86_64.replies | 192 ++++++++++----------- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 164 +++++++++--------- .../caps_2.6.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 140 +++++++-------- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 192 ++++++++++----------- 23 files changed, 1842 insertions(+), 1842 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index e9712caad0..3751702864 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -509,7 +509,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -517,12 +517,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -639,12 +639,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3214,7 +3214,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3222,7 +3222,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3450,7 +3450,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3458,7 +3458,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3745,7 +3745,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3753,7 +3753,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3914,7 +3914,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3922,11 +3922,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3938,11 +3938,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3954,11 +3954,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3970,11 +3970,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3986,11 +3986,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4002,7 +4002,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4109,7 +4109,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4117,7 +4117,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4231,7 +4231,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4239,7 +4239,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4315,7 +4315,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4323,11 +4323,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4339,7 +4339,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4408,7 +4408,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4416,7 +4416,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4443,7 +4443,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4451,11 +4451,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4467,11 +4467,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4483,7 +4483,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4556,7 +4556,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4564,11 +4564,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4580,7 +4580,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4637,7 +4637,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4645,7 +4645,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4796,7 +4796,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4804,7 +4804,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4851,7 +4851,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4859,11 +4859,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4875,7 +4875,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5018,7 +5018,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5026,11 +5026,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5042,7 +5042,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5086,7 +5086,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5094,7 +5094,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5174,12 +5174,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5446,12 +5446,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5617,34 +5617,34 @@ "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": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6789,12 +6789,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6844,12 +6844,12 @@ "capability": "return-path" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16572,12 +16572,12 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16593,7 +16593,7 @@ "kernel": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 12c7611891..232896ed8a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -506,7 +506,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -514,12 +514,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -636,12 +636,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3315,7 +3315,7 @@ "parent": "7455-family-powerpc64-cpu" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3323,7 +3323,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3551,7 +3551,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3559,7 +3559,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3846,7 +3846,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3854,7 +3854,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4015,7 +4015,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4023,11 +4023,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4039,11 +4039,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4055,11 +4055,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4071,11 +4071,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4087,11 +4087,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4103,7 +4103,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4210,7 +4210,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4218,7 +4218,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4332,7 +4332,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4340,7 +4340,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4416,7 +4416,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4424,11 +4424,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4440,7 +4440,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4509,7 +4509,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4517,7 +4517,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4544,7 +4544,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4552,11 +4552,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4568,11 +4568,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4584,7 +4584,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4657,7 +4657,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4665,11 +4665,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4681,7 +4681,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4738,7 +4738,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4746,7 +4746,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4897,7 +4897,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4905,7 +4905,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4952,7 +4952,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4960,11 +4960,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4976,7 +4976,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5119,7 +5119,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5127,11 +5127,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5143,7 +5143,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5187,7 +5187,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5195,7 +5195,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5275,7 +5275,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5283,7 +5283,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5369,12 +5369,12 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5492,12 +5492,12 @@ "cpu-max": 1 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -7673,34 +7673,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" } { @@ -8840,12 +8840,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -8895,12 +8895,12 @@ "capability": "return-path" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -18623,7 +18623,7 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 6dc6a96d8d..3d1d2a3133 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -518,7 +518,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -526,12 +526,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -648,12 +648,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1555,7 +1555,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1563,7 +1563,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1791,7 +1791,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1799,7 +1799,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2086,7 +2086,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2094,7 +2094,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2255,7 +2255,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2263,7 +2263,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2401,7 +2401,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2409,7 +2409,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2610,7 +2610,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2618,7 +2618,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2693,7 +2693,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2701,11 +2701,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2717,11 +2717,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2733,11 +2733,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2749,7 +2749,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2856,7 +2856,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2864,7 +2864,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2978,7 +2978,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2986,11 +2986,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3002,11 +3002,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3018,11 +3018,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3034,7 +3034,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3061,7 +3061,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3069,11 +3069,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3085,11 +3085,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3101,11 +3101,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3117,7 +3117,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3268,7 +3268,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3276,7 +3276,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3323,7 +3323,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3331,11 +3331,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3347,7 +3347,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3490,7 +3490,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3498,7 +3498,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3560,7 +3560,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3568,7 +3568,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3612,7 +3612,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3620,7 +3620,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3630,12 +3630,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3683,12 +3683,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4222,34 +4222,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" } { @@ -5354,12 +5354,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5409,12 +5409,12 @@ "capability": "return-path" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15137,7 +15137,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15148,7 +15148,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15188,7 +15188,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15202,11 +15202,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index d9c59b04c7..79958080e3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -515,7 +515,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -523,12 +523,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -645,12 +645,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2192,7 +2192,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2200,7 +2200,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2428,7 +2428,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2436,7 +2436,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2723,7 +2723,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2731,7 +2731,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2892,7 +2892,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2900,11 +2900,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2916,11 +2916,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2932,11 +2932,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2948,11 +2948,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2964,7 +2964,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3026,7 +3026,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3034,7 +3034,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3141,7 +3141,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3149,7 +3149,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3263,7 +3263,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3271,7 +3271,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3347,7 +3347,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3355,7 +3355,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3418,7 +3418,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3426,7 +3426,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3475,7 +3475,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3483,7 +3483,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3552,7 +3552,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3560,7 +3560,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3587,7 +3587,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3595,7 +3595,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3633,7 +3633,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3641,7 +3641,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3719,7 +3719,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3727,7 +3727,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3800,7 +3800,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3808,7 +3808,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3822,7 +3822,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3830,7 +3830,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3887,7 +3887,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3895,7 +3895,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3938,7 +3938,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3946,7 +3946,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4041,7 +4041,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4049,7 +4049,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4210,7 +4210,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4218,7 +4218,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4275,7 +4275,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4283,7 +4283,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4379,7 +4379,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4387,7 +4387,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4530,7 +4530,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4538,11 +4538,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4554,7 +4554,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4598,7 +4598,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4606,7 +4606,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4686,7 +4686,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4694,7 +4694,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4729,7 +4729,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4737,7 +4737,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4763,12 +4763,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4957,12 +4957,12 @@ "alias": "q35" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5297,36 +5297,36 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6605,12 +6605,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -6660,12 +6660,12 @@ "capability": "return-path" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16388,7 +16388,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16399,7 +16399,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16578,7 +16578,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16759,7 +16759,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17002,7 +17002,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17016,7 +17016,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17195,7 +17195,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17376,7 +17376,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -17619,7 +17619,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index c9057fcea3..a9f08ea573 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -527,7 +527,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -535,12 +535,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -657,12 +657,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1596,7 +1596,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1604,7 +1604,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1832,7 +1832,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1840,7 +1840,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2127,7 +2127,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2135,7 +2135,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2300,7 +2300,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2308,7 +2308,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2446,7 +2446,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2454,7 +2454,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2655,7 +2655,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2663,7 +2663,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2742,7 +2742,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2750,11 +2750,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2766,11 +2766,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2782,11 +2782,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2798,7 +2798,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2910,7 +2910,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2918,7 +2918,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3032,7 +3032,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3040,11 +3040,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3056,11 +3056,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3072,11 +3072,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3088,7 +3088,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3115,7 +3115,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3123,11 +3123,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3139,11 +3139,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3155,11 +3155,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3171,7 +3171,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3322,7 +3322,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3330,7 +3330,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3377,7 +3377,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3385,11 +3385,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3401,7 +3401,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3544,7 +3544,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3552,7 +3552,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3614,7 +3614,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3622,7 +3622,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3666,7 +3666,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3674,7 +3674,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3739,7 +3739,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3747,7 +3747,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3757,12 +3757,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3815,12 +3815,12 @@ "cpu-max": 248 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4354,35 +4354,35 @@ "migration-safe": true } ], - "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" } { @@ -5503,12 +5503,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5566,12 +5566,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15439,7 +15439,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15450,7 +15450,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -15489,7 +15489,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -15503,11 +15503,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { - "id": "libvirt-44", + "id": "libvirt-43", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 96d03d256d..c21d681d24 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -524,7 +524,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -532,12 +532,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -654,12 +654,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2185,7 +2185,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2193,7 +2193,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2421,7 +2421,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2429,7 +2429,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2716,7 +2716,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2724,7 +2724,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2889,7 +2889,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2897,11 +2897,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2913,11 +2913,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2929,11 +2929,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2945,11 +2945,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2961,11 +2961,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2977,7 +2977,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3089,7 +3089,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3097,7 +3097,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3211,7 +3211,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3219,7 +3219,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3295,7 +3295,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3303,7 +3303,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3366,7 +3366,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3374,7 +3374,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3423,7 +3423,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3431,7 +3431,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3500,7 +3500,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3508,7 +3508,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3535,7 +3535,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3543,7 +3543,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3585,7 +3585,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3593,7 +3593,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3675,7 +3675,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3683,7 +3683,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3756,7 +3756,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3764,7 +3764,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3778,7 +3778,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3786,7 +3786,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3843,7 +3843,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3851,7 +3851,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3894,7 +3894,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3902,7 +3902,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3997,7 +3997,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4005,7 +4005,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4166,7 +4166,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4174,7 +4174,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4231,7 +4231,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4239,7 +4239,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4335,7 +4335,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4343,7 +4343,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4486,7 +4486,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4494,11 +4494,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4510,7 +4510,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4554,7 +4554,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4562,7 +4562,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4642,7 +4642,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4650,7 +4650,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4685,7 +4685,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4693,7 +4693,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4736,12 +4736,12 @@ "type": "int32" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4930,12 +4930,12 @@ "cpu-max": 288 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5249,24 +5249,24 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5274,12 +5274,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6574,12 +6574,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -6637,12 +6637,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16510,7 +16510,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16521,7 +16521,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16701,7 +16701,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16883,7 +16883,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17128,7 +17128,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17142,7 +17142,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17322,7 +17322,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17504,7 +17504,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -17749,7 +17749,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 17c7b3f34f..85e52dc1d3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -542,7 +542,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -550,12 +550,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -678,12 +678,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3501,7 +3501,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3509,7 +3509,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3741,7 +3741,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3749,7 +3749,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4044,7 +4044,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4052,7 +4052,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4217,7 +4217,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4225,11 +4225,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4241,11 +4241,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4257,11 +4257,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4273,11 +4273,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4289,11 +4289,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4305,7 +4305,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4431,7 +4431,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4439,7 +4439,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4553,7 +4553,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4561,7 +4561,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4637,7 +4637,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4645,11 +4645,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4661,7 +4661,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4730,7 +4730,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4738,7 +4738,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4769,7 +4769,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4777,11 +4777,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4793,11 +4793,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4809,7 +4809,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4882,7 +4882,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4890,11 +4890,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4906,7 +4906,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4963,7 +4963,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4971,7 +4971,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5122,7 +5122,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5130,7 +5130,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5177,7 +5177,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5185,11 +5185,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5201,7 +5201,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5344,7 +5344,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5352,11 +5352,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5368,7 +5368,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5412,7 +5412,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5420,7 +5420,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5500,7 +5500,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5508,7 +5508,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5562,7 +5562,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5570,11 +5570,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5583,7 +5583,7 @@ { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5880,12 +5880,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -6061,35 +6061,35 @@ "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": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -7250,12 +7250,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7317,12 +7317,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18690,12 +18690,12 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18711,7 +18711,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index a6365cf43c..e544ae3089 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -539,7 +539,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -547,12 +547,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -675,12 +675,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3490,7 +3490,7 @@ "parent": "e500v2-family-powerpc64-cpu" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3498,7 +3498,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3730,7 +3730,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3738,7 +3738,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4033,7 +4033,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4041,7 +4041,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4206,7 +4206,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4214,11 +4214,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4230,11 +4230,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4246,11 +4246,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4262,11 +4262,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4278,11 +4278,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4294,7 +4294,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4420,7 +4420,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4428,7 +4428,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4542,7 +4542,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4550,7 +4550,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4626,7 +4626,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4634,11 +4634,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4650,7 +4650,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4719,7 +4719,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4727,7 +4727,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4758,7 +4758,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4766,11 +4766,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4782,11 +4782,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4798,7 +4798,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4871,7 +4871,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4879,11 +4879,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4895,7 +4895,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4952,7 +4952,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4960,7 +4960,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5111,7 +5111,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5119,7 +5119,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5166,7 +5166,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5174,11 +5174,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5190,7 +5190,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5333,7 +5333,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5341,11 +5341,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5357,7 +5357,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5401,7 +5401,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5409,7 +5409,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5489,7 +5489,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5497,7 +5497,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5555,7 +5555,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5563,7 +5563,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5617,7 +5617,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5625,7 +5625,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5786,12 +5786,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5929,12 +5929,12 @@ "cpu-max": 1 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -8130,35 +8130,35 @@ "static": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9314,12 +9314,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -9381,12 +9381,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -20754,7 +20754,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index ec84f16d31..70456d725c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -551,7 +551,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -559,12 +559,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -687,12 +687,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1642,7 +1642,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1650,7 +1650,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1882,7 +1882,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1890,7 +1890,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2185,7 +2185,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2193,7 +2193,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2358,7 +2358,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2366,7 +2366,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2508,7 +2508,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2516,7 +2516,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2725,7 +2725,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2733,7 +2733,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2812,7 +2812,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2820,11 +2820,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2836,11 +2836,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2852,11 +2852,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2868,7 +2868,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2994,7 +2994,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3002,7 +3002,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3120,7 +3120,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3128,11 +3128,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3144,11 +3144,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3160,11 +3160,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3176,7 +3176,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3207,7 +3207,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3215,11 +3215,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3231,11 +3231,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3247,11 +3247,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3263,7 +3263,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3414,7 +3414,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3422,7 +3422,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3469,7 +3469,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3477,11 +3477,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3493,7 +3493,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3636,7 +3636,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3644,7 +3644,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3706,7 +3706,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3714,7 +3714,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3758,7 +3758,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3766,7 +3766,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3831,7 +3831,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3839,7 +3839,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3854,7 +3854,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3862,7 +3862,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3916,7 +3916,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3924,11 +3924,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -3937,7 +3937,7 @@ { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3995,12 +3995,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4535,35 +4535,35 @@ "migration-safe": true } ], - "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": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5688,12 +5688,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5755,12 +5755,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17128,7 +17128,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17139,7 +17139,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17177,7 +17177,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17191,11 +17191,11 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { - "id": "libvirt-46", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 95e8ef1174..d0a691dab9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -557,7 +557,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -565,12 +565,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -693,12 +693,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2348,7 +2348,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2356,7 +2356,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2588,7 +2588,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2596,7 +2596,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2891,7 +2891,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2899,7 +2899,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3064,7 +3064,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3072,11 +3072,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3088,11 +3088,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3104,11 +3104,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3120,11 +3120,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3136,11 +3136,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3152,7 +3152,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3278,7 +3278,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3286,7 +3286,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3400,7 +3400,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3408,7 +3408,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3484,7 +3484,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3492,7 +3492,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3555,7 +3555,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3563,7 +3563,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3612,7 +3612,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3620,7 +3620,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3689,7 +3689,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3697,7 +3697,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3728,7 +3728,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3736,7 +3736,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3778,7 +3778,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3786,7 +3786,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3868,7 +3868,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3876,7 +3876,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3949,7 +3949,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3957,7 +3957,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3971,7 +3971,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3979,7 +3979,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4036,7 +4036,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4044,7 +4044,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4087,7 +4087,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4095,7 +4095,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4190,7 +4190,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4198,7 +4198,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4349,7 +4349,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4357,7 +4357,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4404,7 +4404,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4412,7 +4412,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4508,7 +4508,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4516,7 +4516,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4659,7 +4659,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4667,11 +4667,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4683,7 +4683,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4727,7 +4727,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4735,7 +4735,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4815,7 +4815,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4823,7 +4823,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4862,7 +4862,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4870,7 +4870,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4913,7 +4913,7 @@ "type": "int32" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4921,7 +4921,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4975,7 +4975,7 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4983,11 +4983,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -4996,7 +4996,7 @@ { "execute": "query-machines", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5195,12 +5195,12 @@ "cpu-max": 255 } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-cpu-definitions", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5714,12 +5714,12 @@ "migration-safe": true } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-models", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5727,12 +5727,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-tpm-types", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5740,12 +5740,12 @@ "passthrough", "emulator" ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-command-line-options", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7032,12 +7032,12 @@ "option": "drive" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-migrate-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -7099,12 +7099,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-qmp-schema", - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18472,7 +18472,7 @@ "meta-type": "object" } ], - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18483,7 +18483,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -18673,7 +18673,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -18865,7 +18865,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19120,7 +19120,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19134,7 +19134,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19324,7 +19324,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19516,7 +19516,7 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -19771,12 +19771,12 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { "execute": "query-sev-capabilities", - "id": "libvirt-54" + "id": "libvirt-53" } { @@ -19786,7 +19786,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-54" + "id": "libvirt-53" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index c1a124adf2..8fcec6431a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -473,7 +473,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -481,12 +481,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -597,12 +597,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1508,7 +1508,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1516,7 +1516,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1678,7 +1678,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1686,7 +1686,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1914,7 +1914,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1922,7 +1922,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2040,7 +2040,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2048,11 +2048,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2064,11 +2064,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2080,11 +2080,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2096,11 +2096,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2112,7 +2112,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2164,7 +2164,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2172,7 +2172,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2256,7 +2256,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2264,7 +2264,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2359,7 +2359,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2367,7 +2367,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2424,7 +2424,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2432,7 +2432,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2485,7 +2485,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2493,7 +2493,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2534,7 +2534,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2542,7 +2542,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2607,7 +2607,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2615,7 +2615,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2642,7 +2642,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2650,7 +2650,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2688,7 +2688,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2696,7 +2696,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2750,7 +2750,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2758,7 +2758,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2818,7 +2818,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2826,7 +2826,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2840,7 +2840,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2848,7 +2848,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2895,7 +2895,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2903,7 +2903,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2936,7 +2936,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2944,7 +2944,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3021,7 +3021,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3029,7 +3029,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3135,7 +3135,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3143,7 +3143,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3183,7 +3183,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3191,7 +3191,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3268,7 +3268,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3276,7 +3276,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3376,7 +3376,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3384,11 +3384,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3400,7 +3400,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3439,7 +3439,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3447,7 +3447,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3517,7 +3517,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3525,7 +3525,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3535,7 +3535,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3543,7 +3543,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3569,12 +3569,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3711,12 +3711,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3806,36 +3806,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4880,12 +4880,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -4919,12 +4919,12 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -12469,7 +12469,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index ec0cc7e55e..35cbc575f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -476,7 +476,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -484,12 +484,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -606,12 +606,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2267,7 +2267,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2275,7 +2275,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2437,7 +2437,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2445,7 +2445,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2673,7 +2673,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2681,7 +2681,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2799,7 +2799,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2807,11 +2807,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2823,11 +2823,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2839,11 +2839,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2855,11 +2855,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2871,11 +2871,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2887,7 +2887,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2975,7 +2975,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2983,7 +2983,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3078,7 +3078,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3086,7 +3086,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3143,7 +3143,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3151,11 +3151,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3167,7 +3167,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3232,7 +3232,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3240,7 +3240,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3267,7 +3267,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3275,11 +3275,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3291,11 +3291,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3307,7 +3307,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3367,7 +3367,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3375,11 +3375,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3391,7 +3391,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3438,7 +3438,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3446,7 +3446,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3542,7 +3542,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3550,7 +3550,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3580,7 +3580,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3588,11 +3588,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3604,7 +3604,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3704,7 +3704,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3712,11 +3712,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3728,7 +3728,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3767,7 +3767,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3775,7 +3775,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3845,12 +3845,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4025,12 +4025,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4129,34 +4129,34 @@ "name": "pxa270" } ], - "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" } { @@ -5128,12 +5128,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5167,12 +5167,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13177,12 +13177,12 @@ "meta-type": "array" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -13198,7 +13198,7 @@ "kernel": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index c803001670..d0f8998634 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -473,7 +473,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -481,12 +481,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -603,12 +603,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2417,7 +2417,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2425,7 +2425,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2587,7 +2587,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2595,7 +2595,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2823,7 +2823,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2831,7 +2831,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2949,7 +2949,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2957,11 +2957,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2973,11 +2973,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2989,11 +2989,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3005,11 +3005,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3021,11 +3021,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3037,7 +3037,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3125,7 +3125,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3133,7 +3133,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3228,7 +3228,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3236,7 +3236,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3293,7 +3293,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3301,11 +3301,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3317,7 +3317,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3382,7 +3382,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3390,7 +3390,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3417,7 +3417,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3425,11 +3425,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3441,11 +3441,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3457,7 +3457,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3517,7 +3517,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3525,11 +3525,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3541,7 +3541,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3588,7 +3588,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3596,7 +3596,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3692,7 +3692,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3700,7 +3700,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3730,7 +3730,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3738,11 +3738,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3754,7 +3754,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3854,7 +3854,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3862,11 +3862,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3878,7 +3878,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3917,7 +3917,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3925,7 +3925,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3995,7 +3995,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4003,7 +4003,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4049,12 +4049,12 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4126,12 +4126,12 @@ "cpu-max": 255 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5433,34 +5433,34 @@ "name": "MPC8541E_v11" } ], - "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" } { @@ -6427,12 +6427,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -6466,12 +6466,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -14476,7 +14476,7 @@ "meta-type": "array" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index 9733d48be6..db84cdf840 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -479,7 +479,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -487,12 +487,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -609,12 +609,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1586,7 +1586,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1594,7 +1594,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1756,7 +1756,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1764,7 +1764,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1992,7 +1992,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2000,7 +2000,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2118,7 +2118,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2126,11 +2126,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2142,11 +2142,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2158,11 +2158,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2174,11 +2174,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2190,7 +2190,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2242,7 +2242,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2250,7 +2250,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2338,7 +2338,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2346,7 +2346,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2441,7 +2441,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2449,7 +2449,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2506,7 +2506,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2514,7 +2514,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2567,7 +2567,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2575,7 +2575,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2616,7 +2616,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2624,7 +2624,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2689,7 +2689,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2697,7 +2697,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2724,7 +2724,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2732,7 +2732,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2770,7 +2770,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2778,7 +2778,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2832,7 +2832,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2840,7 +2840,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2900,7 +2900,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2908,7 +2908,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2922,7 +2922,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2930,7 +2930,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2977,7 +2977,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2985,7 +2985,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3018,7 +3018,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3026,7 +3026,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3103,7 +3103,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3111,7 +3111,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3217,7 +3217,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3225,7 +3225,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3265,7 +3265,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3273,7 +3273,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3350,7 +3350,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3358,7 +3358,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3458,7 +3458,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3466,11 +3466,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3482,7 +3482,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3521,7 +3521,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3529,7 +3529,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3599,7 +3599,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3607,7 +3607,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3617,7 +3617,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3625,7 +3625,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3651,12 +3651,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3769,12 +3769,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3864,36 +3864,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4987,12 +4987,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5026,12 +5026,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -13036,7 +13036,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 621aea5896..81362ae7ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -485,7 +485,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -493,12 +493,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -615,12 +615,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -998,7 +998,7 @@ "name": "s390-skeys-kvm" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1006,7 +1006,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1191,7 +1191,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1199,7 +1199,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1431,7 +1431,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1439,7 +1439,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1561,7 +1561,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1569,7 +1569,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1698,7 +1698,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1706,7 +1706,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1886,7 +1886,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1894,7 +1894,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -1964,7 +1964,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -1972,11 +1972,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1988,11 +1988,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2004,11 +2004,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2020,7 +2020,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2122,7 +2122,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2130,7 +2130,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2240,7 +2240,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2248,11 +2248,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2264,11 +2264,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2280,11 +2280,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2296,7 +2296,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2323,7 +2323,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2331,11 +2331,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2347,11 +2347,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2363,11 +2363,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2379,7 +2379,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2479,7 +2479,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2487,7 +2487,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2517,7 +2517,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2525,11 +2525,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2541,7 +2541,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2645,7 +2645,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2653,7 +2653,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2710,7 +2710,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2718,7 +2718,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2757,7 +2757,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2765,7 +2765,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -2775,12 +2775,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2813,12 +2813,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2827,34 +2827,34 @@ "name": "host" } ], - "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" } { @@ -3790,12 +3790,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3829,12 +3829,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -12190,7 +12190,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 4f7be9337f..5de9e0b1ef 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -488,7 +488,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -496,12 +496,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -618,12 +618,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1610,7 +1610,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1618,7 +1618,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1803,7 +1803,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1811,7 +1811,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2043,7 +2043,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2051,7 +2051,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2173,7 +2173,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2181,11 +2181,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2197,11 +2197,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2213,11 +2213,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2229,11 +2229,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2245,7 +2245,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2302,7 +2302,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2310,7 +2310,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2412,7 +2412,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2420,7 +2420,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2530,7 +2530,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2538,7 +2538,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2610,7 +2610,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2618,7 +2618,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2676,7 +2676,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2684,7 +2684,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2733,7 +2733,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2741,7 +2741,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2810,7 +2810,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2818,7 +2818,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2845,7 +2845,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2853,7 +2853,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2891,7 +2891,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2899,7 +2899,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2977,7 +2977,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2985,7 +2985,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3054,7 +3054,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3062,7 +3062,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3076,7 +3076,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3084,7 +3084,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3136,7 +3136,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3144,7 +3144,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3182,7 +3182,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3190,7 +3190,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3272,7 +3272,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3280,7 +3280,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3390,7 +3390,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3398,7 +3398,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3438,7 +3438,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3446,7 +3446,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3532,7 +3532,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3540,7 +3540,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3644,7 +3644,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3652,11 +3652,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3668,7 +3668,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3707,7 +3707,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3715,7 +3715,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3790,7 +3790,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3798,7 +3798,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3812,7 +3812,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3820,7 +3820,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3846,12 +3846,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4000,12 +4000,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -4098,36 +4098,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5225,12 +5225,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5264,12 +5264,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -13625,7 +13625,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 52de79df75..ca6be2b1a6 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -497,7 +497,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -505,12 +505,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -627,12 +627,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1238,7 +1238,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1246,7 +1246,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1436,7 +1436,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1444,7 +1444,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1685,7 +1685,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1693,7 +1693,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1820,7 +1820,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1828,7 +1828,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1957,7 +1957,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1965,7 +1965,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2149,7 +2149,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2157,7 +2157,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2227,7 +2227,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2235,11 +2235,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2251,11 +2251,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2267,11 +2267,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2283,7 +2283,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2385,7 +2385,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2393,7 +2393,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2503,7 +2503,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2511,11 +2511,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2527,11 +2527,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2543,11 +2543,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2559,7 +2559,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2586,7 +2586,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2594,11 +2594,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2610,11 +2610,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2626,11 +2626,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2642,7 +2642,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2747,7 +2747,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2755,7 +2755,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2785,7 +2785,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2793,11 +2793,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2809,7 +2809,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2918,7 +2918,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2926,7 +2926,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2983,7 +2983,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2991,7 +2991,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3030,7 +3030,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3038,7 +3038,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3048,12 +3048,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3091,12 +3091,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3422,34 +3422,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" } { @@ -4410,12 +4410,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4453,12 +4453,12 @@ "capability": "x-colo" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13228,7 +13228,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13239,7 +13239,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13265,7 +13265,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13279,11 +13279,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index e0783e7e7e..cb87874dfc 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -491,7 +491,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -499,12 +499,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -621,12 +621,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1694,7 +1694,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1702,7 +1702,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1896,7 +1896,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1904,7 +1904,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2149,7 +2149,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2157,7 +2157,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2288,7 +2288,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2296,11 +2296,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2312,11 +2312,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2328,11 +2328,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2344,11 +2344,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2360,7 +2360,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2417,7 +2417,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2425,7 +2425,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2527,7 +2527,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2535,7 +2535,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2645,7 +2645,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2653,7 +2653,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2725,7 +2725,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2733,7 +2733,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2791,7 +2791,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2799,7 +2799,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2848,7 +2848,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2856,7 +2856,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2925,7 +2925,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2933,7 +2933,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2960,7 +2960,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2968,7 +2968,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3006,7 +3006,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3014,7 +3014,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3092,7 +3092,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3100,7 +3100,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3169,7 +3169,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3177,7 +3177,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3191,7 +3191,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3199,7 +3199,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3251,7 +3251,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3259,7 +3259,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3297,7 +3297,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3305,7 +3305,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3387,7 +3387,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3395,7 +3395,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3514,7 +3514,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3522,7 +3522,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3562,7 +3562,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3570,7 +3570,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3656,7 +3656,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3664,7 +3664,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3777,7 +3777,7 @@ "type": "guest statistics" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3785,11 +3785,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3801,7 +3801,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3840,7 +3840,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3848,7 +3848,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3923,7 +3923,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3931,7 +3931,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3954,7 +3954,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3962,7 +3962,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3988,12 +3988,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4162,12 +4162,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -4373,36 +4373,36 @@ "static": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5525,12 +5525,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5568,12 +5568,12 @@ "capability": "x-colo" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -14343,7 +14343,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index 53a3c0a580..b2e224725c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -497,7 +497,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -505,12 +505,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -627,12 +627,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2582,7 +2582,7 @@ "name": "7457A_v1.2-powerpc64-cpu" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2590,7 +2590,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2818,7 +2818,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2826,7 +2826,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3105,7 +3105,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3113,7 +3113,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3274,7 +3274,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3282,11 +3282,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3298,11 +3298,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3314,11 +3314,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3330,11 +3330,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3346,11 +3346,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3362,7 +3362,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3469,7 +3469,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3477,7 +3477,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3591,7 +3591,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3599,7 +3599,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3675,7 +3675,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3683,11 +3683,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3699,11 +3699,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3715,7 +3715,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3742,7 +3742,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3750,11 +3750,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3766,11 +3766,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3782,7 +3782,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3855,7 +3855,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3863,11 +3863,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3879,7 +3879,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3936,7 +3936,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3944,7 +3944,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4087,7 +4087,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4095,7 +4095,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4134,7 +4134,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4142,11 +4142,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4158,7 +4158,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4301,7 +4301,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4309,11 +4309,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4325,7 +4325,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4369,7 +4369,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4377,7 +4377,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4457,7 +4457,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4465,7 +4465,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4551,12 +4551,12 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4669,12 +4669,12 @@ "cpu-max": 1 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6850,34 +6850,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" } { @@ -7987,12 +7987,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -8034,12 +8034,12 @@ "capability": "release-ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -17325,7 +17325,7 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 5c28c38ccd..5e2b4518fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -509,7 +509,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -517,12 +517,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -639,12 +639,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1286,7 +1286,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1294,7 +1294,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1522,7 +1522,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1530,7 +1530,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1809,7 +1809,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1817,7 +1817,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1978,7 +1978,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1986,7 +1986,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2124,7 +2124,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2132,7 +2132,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2325,7 +2325,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2333,7 +2333,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2408,7 +2408,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2416,11 +2416,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2432,11 +2432,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2448,11 +2448,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2464,7 +2464,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2571,7 +2571,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2579,7 +2579,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2693,7 +2693,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2701,11 +2701,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2717,11 +2717,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2733,11 +2733,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2749,7 +2749,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2776,7 +2776,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2784,11 +2784,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2800,11 +2800,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2816,11 +2816,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2832,7 +2832,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2975,7 +2975,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2983,7 +2983,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3022,7 +3022,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3030,11 +3030,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3046,7 +3046,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3189,7 +3189,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3197,7 +3197,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3259,7 +3259,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3267,7 +3267,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3311,7 +3311,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3319,7 +3319,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3329,12 +3329,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3377,12 +3377,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3772,34 +3772,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" } { @@ -4874,12 +4874,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4921,12 +4921,12 @@ "capability": "release-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14212,7 +14212,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14223,7 +14223,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14250,7 +14250,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14264,11 +14264,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index a432c5b9d2..0e5d78e15f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -506,7 +506,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -514,12 +514,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -636,12 +636,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1772,7 +1772,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1780,7 +1780,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2008,7 +2008,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2016,7 +2016,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2295,7 +2295,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2303,7 +2303,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2464,7 +2464,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2472,11 +2472,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2488,11 +2488,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2504,11 +2504,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2520,11 +2520,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2536,7 +2536,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2598,7 +2598,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2606,7 +2606,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2713,7 +2713,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2721,7 +2721,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2835,7 +2835,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2843,7 +2843,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2919,7 +2919,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2927,7 +2927,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2990,7 +2990,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2998,7 +2998,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3047,7 +3047,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3055,7 +3055,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3124,7 +3124,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3132,7 +3132,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3159,7 +3159,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3167,7 +3167,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3205,7 +3205,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3213,7 +3213,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3291,7 +3291,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3299,7 +3299,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3372,7 +3372,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3380,7 +3380,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3394,7 +3394,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3402,7 +3402,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3459,7 +3459,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3467,7 +3467,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3510,7 +3510,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3518,7 +3518,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3605,7 +3605,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3613,7 +3613,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3766,7 +3766,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3774,7 +3774,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3823,7 +3823,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3831,7 +3831,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3927,7 +3927,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3935,7 +3935,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4078,7 +4078,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4086,11 +4086,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4102,7 +4102,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4146,7 +4146,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4154,7 +4154,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4234,7 +4234,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4242,7 +4242,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4273,7 +4273,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4281,7 +4281,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4307,12 +4307,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4491,12 +4491,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -4778,36 +4778,36 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6056,12 +6056,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -6103,12 +6103,12 @@ "capability": "release-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15394,7 +15394,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15405,7 +15405,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -15584,7 +15584,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -15765,7 +15765,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16006,7 +16006,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16020,7 +16020,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -16199,7 +16199,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -16380,7 +16380,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -16621,7 +16621,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 533404112c..ef5189687a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -584,7 +584,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -592,12 +592,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -723,12 +723,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3570,7 +3570,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3578,7 +3578,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3810,7 +3810,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3818,7 +3818,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4108,7 +4108,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4116,7 +4116,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4281,7 +4281,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4289,11 +4289,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4305,11 +4305,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4321,11 +4321,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4337,11 +4337,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4353,11 +4353,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4369,7 +4369,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4503,7 +4503,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4511,7 +4511,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4629,7 +4629,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4637,7 +4637,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4713,7 +4713,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4721,11 +4721,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4737,7 +4737,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4806,7 +4806,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4814,7 +4814,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4845,7 +4845,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4853,11 +4853,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4869,11 +4869,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4885,7 +4885,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4958,7 +4958,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4966,11 +4966,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4982,7 +4982,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5039,7 +5039,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5047,7 +5047,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5198,7 +5198,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5206,7 +5206,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5253,7 +5253,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5261,11 +5261,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5277,7 +5277,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5420,7 +5420,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5428,11 +5428,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5444,7 +5444,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5488,7 +5488,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5496,7 +5496,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5576,7 +5576,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5584,7 +5584,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5642,7 +5642,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5650,7 +5650,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5700,7 +5700,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5708,7 +5708,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5879,12 +5879,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -6027,12 +6027,12 @@ "cpu-max": 1 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -8228,35 +8228,35 @@ "static": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9386,12 +9386,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -9461,12 +9461,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -21625,7 +21625,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index 2c822a5034..f1b469f0f4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -602,7 +602,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -610,12 +610,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -744,12 +744,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2415,7 +2415,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2423,7 +2423,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2655,7 +2655,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2663,7 +2663,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2953,7 +2953,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2961,7 +2961,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3126,7 +3126,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3134,11 +3134,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3150,11 +3150,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3166,11 +3166,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3182,11 +3182,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3198,11 +3198,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3214,7 +3214,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3348,7 +3348,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3356,7 +3356,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3474,7 +3474,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3482,7 +3482,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3558,7 +3558,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3566,7 +3566,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3629,7 +3629,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3637,7 +3637,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3686,7 +3686,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3694,7 +3694,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3763,7 +3763,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3771,7 +3771,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3802,7 +3802,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3810,7 +3810,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3852,7 +3852,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3860,7 +3860,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3942,7 +3942,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3950,7 +3950,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4033,7 +4033,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4041,7 +4041,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4055,7 +4055,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4063,7 +4063,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4124,7 +4124,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4132,7 +4132,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4179,7 +4179,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4187,7 +4187,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4286,7 +4286,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4294,7 +4294,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4455,7 +4455,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4463,7 +4463,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4520,7 +4520,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4528,7 +4528,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4624,7 +4624,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4632,7 +4632,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4775,7 +4775,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4783,11 +4783,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4799,7 +4799,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4843,7 +4843,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4851,7 +4851,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4931,7 +4931,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4939,7 +4939,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4978,7 +4978,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4986,7 +4986,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5029,7 +5029,7 @@ "type": "int32" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5037,7 +5037,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5087,7 +5087,7 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5095,11 +5095,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5108,7 +5108,7 @@ { "execute": "query-machines", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5317,12 +5317,12 @@ "cpu-max": 255 } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-cpu-definitions", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5759,12 +5759,12 @@ "migration-safe": true } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-models", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5772,12 +5772,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-tpm-types", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5785,12 +5785,12 @@ "passthrough", "emulator" ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-command-line-options", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7089,12 +7089,12 @@ "option": "drive" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-migrate-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -7164,12 +7164,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-qmp-schema", - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19049,7 +19049,7 @@ "meta-type": "object" } ], - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19060,7 +19060,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19253,7 +19253,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19448,7 +19448,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19711,7 +19711,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19725,7 +19725,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19918,7 +19918,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -20113,7 +20113,7 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -20376,16 +20376,16 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { "execute": "query-sev-capabilities", - "id": "libvirt-54" + "id": "libvirt-53" } { - "id": "libvirt-54", + "id": "libvirt-53", "error": { "class": "GenericError", "desc": "SEV feature is not available" -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Split up for simpler reviews.
thanks! it helped.
--- .../caps_2.10.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 148 ++++++++-------- .../caps_2.10.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 152 ++++++++-------- .../caps_2.11.0.x86_64.replies | 180 +++++++++---------- .../caps_2.12.0.aarch64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 160 ++++++++--------- .../caps_2.12.0.x86_64.replies | 192 ++++++++++----------- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 164 +++++++++--------- .../caps_2.6.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 140 +++++++-------- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 192 ++++++++++----------- 23 files changed, 1842 insertions(+), 1842 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John
Allow FDs which are marked as safe for FD passing. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvmock.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 4df92cf396..581f720227 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -184,12 +184,26 @@ virNetDevRunEthernetScript(const char *ifname ATTRIBUTE_UNUSED, return 0; } +static void (*real_virCommandPassFD)(virCommandPtr cmd, int fd, unsigned int flags); + +static const int testCommandPassSafeFDs[] = { -1 }; + void -virCommandPassFD(virCommandPtr cmd ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) +virCommandPassFD(virCommandPtr cmd, + int fd, + unsigned int flags) { - /* nada */ + size_t i; + + for (i = 0; i < ARRAY_CARDINALITY(testCommandPassSafeFDs); i++) { + if (testCommandPassSafeFDs[i] == fd) { + if (!real_virCommandPassFD) + VIR_MOCK_REAL_INIT(virCommandPassFD); + + real_virCommandPassFD(cmd, fd, flags); + return; + } + } } int -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Allow FDs which are marked as safe for FD passing.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvmock.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John
Allow mocking of the file descriptor numbers used for the TPM passthrough mode by extracting the relevant code into an exported function. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_command.h | 7 +++++++ 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ddb90895e0..fa66b8affb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9586,6 +9586,31 @@ qemuBuildTPMDevStr(const virDomainDef *def, } +/* this function is exported so that tests can mock the FDs */ +int +qemuBuildTPMOpenBackendFDs(const char *tpmdev, + const char *cancel_path, + int *tpmfd, + int *cancelfd) +{ + if ((*tpmfd = open(tpmdev, O_RDWR)) < 0) { + virReportSystemError(errno, _("Could not open TPM device %s"), + tpmdev); + return -1; + } + + if ((*cancelfd = open(cancel_path, O_WRONLY)) < 0) { + virReportSystemError(errno, + _("Could not open TPM device's cancel " + "path %s"), cancel_path); + VIR_FORCE_CLOSE(*tpmfd); + return -1; + } + + return 0; +} + + static char * qemuBuildTPMBackendStr(const virDomainDef *def, virCommandPtr cmd, @@ -9624,12 +9649,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, goto error; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - *tpmfd = open(tpmdev, O_RDWR); - if (*tpmfd < 0) { - virReportSystemError(errno, _("Could not open TPM device %s"), - tpmdev); + if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0) goto error; - } virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -9637,17 +9658,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, if (devset == NULL) goto error; - *cancelfd = open(cancel_path, O_WRONLY); - if (*cancelfd < 0) { - virReportSystemError(errno, - _("Could not open TPM device's cancel " - "path %s"), cancel_path); - goto error; - } - VIR_FREE(cancel_path); - virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + VIR_FREE(cancel_path); cancel_path = qemuVirCommandGetDevSet(cmd, *cancelfd); if (cancel_path == NULL) goto error; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 283bf3120d..7f84f904ce 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -216,4 +216,11 @@ qemuBuildVsockDevStr(virDomainDefPtr def, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); +/* this function is exported so that tests can mock the FDs */ +int +qemuBuildTPMOpenBackendFDs(const char *tpmdev, + const char *cancel_path, + int *tpmfd, + int *cancelfd); + #endif /* __QEMU_COMMAND_H__*/ -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Allow mocking of the file descriptor numbers used for the TPM passthrough mode by extracting the relevant code into an exported function.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_command.h | 7 +++++++ 2 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ddb90895e0..fa66b8affb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9586,6 +9586,31 @@ qemuBuildTPMDevStr(const virDomainDef *def, }
[...]
static char * qemuBuildTPMBackendStr(const virDomainDef *def, virCommandPtr cmd, @@ -9624,12 +9649,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, goto error;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - *tpmfd = open(tpmdev, O_RDWR); - if (*tpmfd < 0) { - virReportSystemError(errno, _("Could not open TPM device %s"), - tpmdev); + if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0) goto error; - }
virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -9637,17 +9658,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, if (devset == NULL)
@cancelfd would be leaked...
goto error;
[...]
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 283bf3120d..7f84f904ce 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -216,4 +216,11 @@ qemuBuildVsockDevStr(virDomainDefPtr def, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
+/* this function is exported so that tests can mock the FDs */ +int +qemuBuildTPMOpenBackendFDs(const char *tpmdev, + const char *cancel_path, + int *tpmfd, + int *cancelfd);
should this follow others in here w/r/t ATTRIBUTE_NONNULL for args?
+ #endif /* __QEMU_COMMAND_H__*/
With at lest the leak resolved, Reviewed-by: John Ferlan <jferlan@redhat.com> John
All supported qemus support FD passing so modify the tests to test the proper code path. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 5 +++-- tests/qemuxml2argvdata/tpm-passthrough.args | 5 +++-- tests/qemuxml2argvmock.c | 18 +++++++++++++++++- tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.args index 8c73bc6706..4da8be1a73 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.args @@ -21,7 +21,8 @@ server,nowait \ -no-shutdown \ -boot menu=on \ -usb \ --tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ -cancel-path=/sys/class/misc/tpm0/device/cancel \ +-tpmdev passthrough,id=tpm-tpm0,path=/dev/fdset/0,cancel-path=/dev/fdset/1 \ +-add-fd set=0,fd=1730 \ +-add-fd set=1,fd=1731 \ -device tpm-crb,tpmdev=tpm-tpm0,id=tpm0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/tpm-passthrough.args b/tests/qemuxml2argvdata/tpm-passthrough.args index d4dd371f06..8ab7693009 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.args @@ -21,7 +21,8 @@ server,nowait \ -no-shutdown \ -boot menu=on \ -usb \ --tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ -cancel-path=/sys/class/misc/tpm0/device/cancel \ +-tpmdev passthrough,id=tpm-tpm0,path=/dev/fdset/0,cancel-path=/dev/fdset/1 \ +-add-fd set=0,fd=1730 \ +-add-fd set=1,fd=1731 \ -device tpm-tis,tpmdev=tpm-tpm0,id=tpm0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 581f720227..4b4a6f764f 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -186,7 +186,7 @@ virNetDevRunEthernetScript(const char *ifname ATTRIBUTE_UNUSED, static void (*real_virCommandPassFD)(virCommandPtr cmd, int fd, unsigned int flags); -static const int testCommandPassSafeFDs[] = { -1 }; +static const int testCommandPassSafeFDs[] = { 1730, 1731 }; void virCommandPassFD(virCommandPtr cmd, @@ -247,3 +247,19 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev ATTRIBUTE_UNUSED) abort(); return 1729; } + + +int +qemuBuildTPMOpenBackendFDs(const char *tpmdev ATTRIBUTE_UNUSED, + const char *cancel_path ATTRIBUTE_UNUSED, + int *tpmfd, + int *cancelfd) +{ + if (fcntl(1730, F_GETFD) != -1 || + fcntl(1731, F_GETFD) != -1) + abort(); + + *tpmfd = 1730; + *cancelfd = 1731; + return 0; +} diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8a7b82a1f2..5c01fba6f0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2061,8 +2061,10 @@ mymain(void) QEMU_CAPS_KVM); DO_TEST("tpm-passthrough", + QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); DO_TEST("tpm-passthrough-crb", + QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB); DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
All supported qemus support FD passing so modify the tests to test the proper code path.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 5 +++-- tests/qemuxml2argvdata/tpm-passthrough.args | 5 +++-- tests/qemuxml2argvmock.c | 18 +++++++++++++++++- tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 25 insertions(+), 5 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John
The capability was usable since qemu 1.3 so we can remove all the detection code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 17 ------------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 32 ++++++++++------------ .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- .../caps_2.12.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- tests/qemuxml2argvtest.c | 2 -- 60 files changed, 43 insertions(+), 570 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 755a666ab1..4b81c331b0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1008,7 +1008,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-vnc", QEMU_CAPS_VNC }, { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, - { "add-fd", QEMU_CAPS_ADD_FD }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, @@ -2123,22 +2122,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, ncommands, commands); virStringListFreeCount(commands, ncommands); - /* QMP add-fd was introduced in 1.2, but did not support - * management control of set numbering, and did not have a - * counterpart -add-fd command line option. We require the - * add-fd features from 1.3 or later. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - int fd = open("/dev/null", O_RDONLY); - if (fd < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unable to probe for add-fd")); - return -1; - } - if (qemuMonitorAddFd(mon, 0, fd, "/dev/null") < 0) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_ADD_FD); - VIR_FORCE_CLOSE(fd); - } - /* Probe for active commit of qemu 2.1. We don't need to query directly * if we have QMP schema support */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) && diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 26813a908c..888a6b2b27 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -225,7 +225,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 125 */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ - QEMU_CAPS_ADD_FD, /* -add-fd */ + X_QEMU_CAPS_ADD_FD, /* -add-fd */ QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fa66b8affb..63b90f41fd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9622,7 +9622,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, const virDomainTPMDef *tpm = def->tpm; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type = NULL; - char *cancel_path = NULL, *devset = NULL; + char *cancel_path = NULL; + char *devset = NULL; + char *cancelset = NULL; const char *tpmdev; *tpmfd = -1; @@ -9648,30 +9650,24 @@ qemuBuildTPMBackendStr(const virDomainDef *def, if (!(cancel_path = virTPMCreateCancelPath(tpmdev))) goto error; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0) - goto error; + if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0) + goto error; - virCommandPassFD(cmd, *tpmfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - devset = qemuVirCommandGetDevSet(cmd, *tpmfd); - if (devset == NULL) - goto error; + virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (!(devset = qemuVirCommandGetDevSet(cmd, *tpmfd))) + goto error; - virCommandPassFD(cmd, *cancelfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - VIR_FREE(cancel_path); - cancel_path = qemuVirCommandGetDevSet(cmd, *cancelfd); - if (cancel_path == NULL) - goto error; - } + virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (!(cancelset = qemuVirCommandGetDevSet(cmd, *cancelfd))) + goto error; virBufferAddLit(&buf, ",path="); - virQEMUBuildBufferEscapeComma(&buf, devset ? devset : tpmdev); + virQEMUBuildBufferEscapeComma(&buf, devset); virBufferAddLit(&buf, ",cancel-path="); - virQEMUBuildBufferEscapeComma(&buf, cancel_path); + virQEMUBuildBufferEscapeComma(&buf, cancelset); VIR_FREE(devset); + VIR_FREE(cancelset); VIR_FREE(cancel_path); break; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index de7d441deb..6468691609 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -331,23 +331,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index a8dd69f4fa..2a98e8a3c6 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -60,7 +60,6 @@ <flag name='vmware-svga'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -109,7 +108,7 @@ <flag name='mch'/> <version>1005003</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>51089</microcodeVersion> + <microcodeVersion>50896</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index 53cd0819dd..028dd103fb 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -337,23 +337,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 536e0e19eb..67bb5c5971 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -114,7 +113,7 @@ <flag name='mch'/> <version>1006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>49318</microcodeVersion> + <microcodeVersion>49125</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 7985f280b6..1e99156710 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -346,23 +346,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 41f57963fa..2df50c71c7 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -116,7 +115,7 @@ <flag name='mch'/> <version>1007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>54762</microcodeVersion> + <microcodeVersion>54569</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index 646dce8250..c0bfec0c3a 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -379,23 +379,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 28f2db1fbc..bc1c5d553f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -132,7 +131,7 @@ <flag name='mch'/> <version>2001001</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>63558</microcodeVersion> + <microcodeVersion>63365</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 3751702864..961b189a78 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -490,23 +490,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 97318fa72f..cb2740ad14 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -46,7 +46,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -161,7 +160,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>307434</microcodeVersion> + <microcodeVersion>307241</microcodeVersion> <package> (v2.10.0)</package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 232896ed8a..80dabec28d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -487,23 +487,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 35b79569dc..91583a5659 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -45,7 +45,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -160,7 +159,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>386779</microcodeVersion> + <microcodeVersion>386586</microcodeVersion> <package> (v2.10.0)</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 3d1d2a3133..84680be49d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -499,23 +499,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index a763a9e9be..aa61a331b8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -28,7 +28,6 @@ <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -121,7 +120,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>307686</microcodeVersion> + <microcodeVersion>307493</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 79958080e3..cff292be8c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -496,23 +496,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 8ca64d6178..647c0ce4ba 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -205,7 +204,7 @@ <flag name='egl-headless'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>367782</microcodeVersion> + <microcodeVersion>367589</microcodeVersion> <package> (v2.10.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index a9f08ea573..1711915888 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -508,23 +508,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 79656e6b95..2bb4a767e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -28,7 +28,6 @@ <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -128,7 +127,7 @@ <flag name='egl-headless'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>346538</microcodeVersion> + <microcodeVersion>346345</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index c21d681d24..355786cec7 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -505,23 +505,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 69f3f2c82f..f07ea7e796 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -59,7 +59,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -209,7 +208,7 @@ <flag name='egl-headless'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>371242</microcodeVersion> + <microcodeVersion>371049</microcodeVersion> <package> (v2.11.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 85e52dc1d3..e919c93efa 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -523,23 +523,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 20, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 926db70f80..3c1a704100 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -46,7 +46,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -172,7 +171,7 @@ <flag name='vfio-pci.display'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>347337</microcodeVersion> + <microcodeVersion>347144</microcodeVersion> <package>v2.12.0-rc0</package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index e544ae3089..343f27576f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -520,23 +520,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 66a77638a5..3f4ef8fc41 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -45,7 +45,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -170,7 +169,7 @@ <flag name='vfio-pci.display'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>428121</microcodeVersion> + <microcodeVersion>427928</microcodeVersion> <package>v2.12.0-rc0</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 70456d725c..2031a692d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -532,23 +532,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 18, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index f7c54df0d7..d1d9353f35 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -28,7 +28,6 @@ <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -136,7 +135,7 @@ <flag name='vfio-pci.display'/> <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>375786</microcodeVersion> + <microcodeVersion>375593</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index d0a691dab9..3d900d827a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -538,23 +538,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 8453883fe8..9f09d68b19 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -59,7 +59,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -214,7 +213,7 @@ <flag name='vfio-pci.display'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>415983</microcodeVersion> + <microcodeVersion>415790</microcodeVersion> <package>v2.12.0-rc0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index 5c44a6aae5..39fdf0c792 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -427,23 +427,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 8b480889b8..5dc67aa2ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -158,7 +157,7 @@ <flag name='mch'/> <version>2004000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>80332</microcodeVersion> + <microcodeVersion>80139</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 8fcec6431a..9f2ed91843 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -454,23 +454,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index ffa2b87f8b..23cf05b9d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -164,7 +163,7 @@ <flag name='mch'/> <version>2005000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>221300</microcodeVersion> + <microcodeVersion>221107</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 35cbc575f3..da3ee9ffe3 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -457,23 +457,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 70b5c4896f..f63e141326 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -48,7 +48,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -145,7 +144,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>232145</microcodeVersion> + <microcodeVersion>231952</microcodeVersion> <package></package> <arch>aarch64</arch> <cpu type='kvm' name='pxa262'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index d0f8998634..fb710d0a6f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -454,23 +454,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 0155c85971..0a4f62996c 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -45,7 +45,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -140,7 +139,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>266971</microcodeVersion> + <microcodeVersion>266778</microcodeVersion> <package></package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index db84cdf840..626d43d3e8 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -460,23 +460,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index e7bf91cc64..f8643335f1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -176,7 +175,7 @@ <flag name='mch'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>232104</microcodeVersion> + <microcodeVersion>231911</microcodeVersion> <package></package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 81362ae7ad..2eb9ecd86c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -466,23 +466,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 459f2da46c..945afab5c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -28,7 +28,6 @@ <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -108,7 +107,7 @@ <flag name='sdl-gl'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>220579</microcodeVersion> + <microcodeVersion>220386</microcodeVersion> <package></package> <arch>s390x</arch> <cpu type='kvm' name='host'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 5de9e0b1ef..79fed5c27b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -469,23 +469,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index defd5554e6..5e1c942bbe 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -181,7 +180,7 @@ <flag name='mch'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>243792</microcodeVersion> + <microcodeVersion>243599</microcodeVersion> <package> (v2.7.0)</package> <arch>x86_64</arch> <cpu type='kvm' name='Opteron_G5'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index ca6be2b1a6..2f0f90ce0c 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -478,23 +478,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 564c6c481a..00549630c1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -28,7 +28,6 @@ <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -111,7 +110,7 @@ <flag name='vhost-vsock'/> <version>2007093</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>245993</microcodeVersion> + <microcodeVersion>245800</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='zEC12.2-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index cb87874dfc..2edc628898 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -472,23 +472,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 318059bba1..db87895552 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -184,7 +183,7 @@ <flag name='mch'/> <version>2008000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>260447</microcodeVersion> + <microcodeVersion>260254</microcodeVersion> <package> (v2.8.0)</package> <arch>x86_64</arch> <cpu type='kvm' name='host' usable='yes'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index b2e224725c..977f60078f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -478,23 +478,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index ea81b431f9..149666e093 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -44,7 +44,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -151,7 +150,7 @@ <flag name='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>350495</microcodeVersion> + <microcodeVersion>350302</microcodeVersion> <package> (v2.9.0)</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 5e2b4518fa..1e2a93ff0a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -490,23 +490,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index a1e0152f95..789279e24d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -28,7 +28,6 @@ <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -115,7 +114,7 @@ <flag name='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>269412</microcodeVersion> + <microcodeVersion>269219</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z13.2-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 0e5d78e15f..a55a4a111a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -487,23 +487,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 54c4e4ce57..8be3d77fef 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -199,7 +198,7 @@ <flag name='mch'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>343771</microcodeVersion> + <microcodeVersion>343578</microcodeVersion> <package> (v2.9.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index ef5189687a..cf1a8bfe3d 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -565,23 +565,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 85848ecdae..7e3890e26e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -45,7 +45,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -170,7 +169,7 @@ <flag name='vfio-pci.display'/> <version>2012050</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>446558</microcodeVersion> + <microcodeVersion>446365</microcodeVersion> <package>v2.12.0-1689-g518d23a</package> <arch>ppc64</arch> <cpu type='kvm' name='default'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index f1b469f0f4..d6e0967172 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -583,23 +583,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", "id": "libvirt-6" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 02939f178f..171063646a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -59,7 +59,6 @@ <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> @@ -217,7 +216,7 @@ <flag name='vfio-pci.display'/> <version>3000000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>427584</microcodeVersion> + <microcodeVersion>427391</microcodeVersion> <package>v3.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5c01fba6f0..8a7b82a1f2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2061,10 +2061,8 @@ mymain(void) QEMU_CAPS_KVM); DO_TEST("tpm-passthrough", - QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); DO_TEST("tpm-passthrough-crb", - QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB); DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
The capability was usable since qemu 1.3 so we can remove all the detection code.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 17 ------------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 32 ++++++++++------------ .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- .../caps_2.12.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- tests/qemuxml2argvtest.c | 2 -- 60 files changed, 43 insertions(+), 570 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John
Split up for simpler reviews. --- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 152 ++++++++-------- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 152 ++++++++-------- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 152 ++++++++-------- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 152 ++++++++-------- .../caps_2.10.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 148 ++++++++-------- .../caps_2.10.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 152 ++++++++-------- .../caps_2.11.0.x86_64.replies | 180 +++++++++---------- .../caps_2.12.0.aarch64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 160 ++++++++--------- .../caps_2.12.0.x86_64.replies | 192 ++++++++++----------- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 164 +++++++++--------- .../caps_2.6.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 140 +++++++-------- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 192 ++++++++++----------- 28 files changed, 2228 insertions(+), 2228 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 6468691609..600ca5a6f7 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -336,11 +336,11 @@ "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "GenericError", "desc": "Parameter 'top' is missing" @@ -349,7 +349,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -357,12 +357,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -446,12 +446,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1027,7 +1027,7 @@ "name": "VGA" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1035,7 +1035,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1137,7 +1137,7 @@ "type": "hex32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1145,7 +1145,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1291,7 +1291,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1299,7 +1299,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1361,7 +1361,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1369,11 +1369,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1385,11 +1385,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1401,11 +1401,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1417,11 +1417,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1433,7 +1433,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1479,7 +1479,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1487,7 +1487,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1529,7 +1529,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1537,7 +1537,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1611,7 +1611,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1619,7 +1619,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1673,7 +1673,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1681,7 +1681,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1723,7 +1723,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1731,7 +1731,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1761,7 +1761,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1769,7 +1769,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1823,7 +1823,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1831,7 +1831,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1857,7 +1857,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1865,13 +1865,13 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { "return": [ ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1879,7 +1879,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1889,7 +1889,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1897,7 +1897,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1947,7 +1947,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1955,7 +1955,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -1969,7 +1969,7 @@ "type": "hex32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -1977,7 +1977,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2011,7 +2011,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2019,7 +2019,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2049,7 +2049,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2057,7 +2057,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2127,7 +2127,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2135,11 +2135,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2151,7 +2151,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2189,7 +2189,7 @@ "type": "on/off" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2197,11 +2197,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2213,13 +2213,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2227,7 +2227,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2277,7 +2277,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2285,7 +2285,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2311,12 +2311,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2389,12 +2389,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2472,34 +2472,34 @@ "name": "qemu64" } ], - "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" } { @@ -3200,12 +3200,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3215,7 +3215,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index 028dd103fb..e74ae6b958 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -342,11 +342,11 @@ "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "GenericError", "desc": "Parameter 'top' is missing" @@ -355,7 +355,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -363,12 +363,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -455,12 +455,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1048,7 +1048,7 @@ "name": "VGA" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1056,7 +1056,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1158,7 +1158,7 @@ "type": "hex32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1166,7 +1166,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1320,7 +1320,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1328,7 +1328,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1390,7 +1390,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1398,11 +1398,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1414,11 +1414,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1430,11 +1430,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1446,11 +1446,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1462,7 +1462,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1508,7 +1508,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1516,7 +1516,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1558,7 +1558,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1566,7 +1566,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1640,7 +1640,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1648,7 +1648,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1702,7 +1702,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1710,7 +1710,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1752,7 +1752,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1760,7 +1760,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1794,7 +1794,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1802,7 +1802,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1860,7 +1860,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1868,7 +1868,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1894,7 +1894,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1902,7 +1902,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1912,7 +1912,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1920,7 +1920,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1934,7 +1934,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1942,7 +1942,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1992,7 +1992,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2000,7 +2000,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2014,7 +2014,7 @@ "type": "hex32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2022,7 +2022,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2056,7 +2056,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2064,7 +2064,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2094,7 +2094,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2102,7 +2102,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2172,7 +2172,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2180,11 +2180,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2196,7 +2196,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2234,7 +2234,7 @@ "type": "on/off" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2242,11 +2242,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2258,13 +2258,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2272,7 +2272,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2322,7 +2322,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2330,7 +2330,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2356,12 +2356,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2442,12 +2442,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2525,34 +2525,34 @@ "name": "qemu64" } ], - "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" } { @@ -3155,12 +3155,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3182,7 +3182,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 1e99156710..a6c8e1e459 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -351,11 +351,11 @@ "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "GenericError", "desc": "Parameter 'top' is missing" @@ -364,7 +364,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -372,12 +372,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -467,12 +467,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1057,7 +1057,7 @@ "name": "VGA" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1065,7 +1065,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1167,7 +1167,7 @@ "type": "hex32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1175,7 +1175,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1329,7 +1329,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1337,7 +1337,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1399,7 +1399,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1407,11 +1407,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1423,11 +1423,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1439,11 +1439,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1455,11 +1455,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1471,7 +1471,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1517,7 +1517,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1525,7 +1525,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1567,7 +1567,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1575,7 +1575,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1649,7 +1649,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1657,7 +1657,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1711,7 +1711,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1719,7 +1719,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1761,7 +1761,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1769,7 +1769,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1803,7 +1803,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1811,7 +1811,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1869,7 +1869,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1877,7 +1877,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1903,7 +1903,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1911,7 +1911,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1925,7 +1925,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1933,7 +1933,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1951,7 +1951,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1959,7 +1959,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2009,7 +2009,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2017,7 +2017,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2031,7 +2031,7 @@ "type": "hex32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2039,7 +2039,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2073,7 +2073,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2081,7 +2081,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2111,7 +2111,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2119,7 +2119,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2189,7 +2189,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2197,11 +2197,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2213,7 +2213,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2251,7 +2251,7 @@ "type": "on/off" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2259,11 +2259,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2275,13 +2275,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2289,7 +2289,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2339,7 +2339,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2347,7 +2347,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2373,12 +2373,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2467,12 +2467,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2550,34 +2550,34 @@ "name": "qemu64" } ], - "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" } { @@ -3370,12 +3370,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3397,7 +3397,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index c0bfec0c3a..88152e56bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -384,11 +384,11 @@ "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "DeviceNotFound", "desc": "Device 'bogus' not found" @@ -397,7 +397,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -405,12 +405,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -512,12 +512,12 @@ "name": "BLOCK_IMAGE_CORRUPTED" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1300,7 +1300,7 @@ "name": "fusbh200-ehci-usb" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1308,7 +1308,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1418,7 +1418,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1426,7 +1426,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1588,7 +1588,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1596,7 +1596,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1666,7 +1666,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1674,11 +1674,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1690,11 +1690,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1706,11 +1706,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1722,11 +1722,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1738,7 +1738,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1784,7 +1784,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1792,7 +1792,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1834,7 +1834,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1842,7 +1842,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1928,7 +1928,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1936,7 +1936,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1990,7 +1990,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1998,7 +1998,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2048,7 +2048,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2056,7 +2056,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2094,7 +2094,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2102,7 +2102,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2164,7 +2164,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2172,7 +2172,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2198,7 +2198,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2206,7 +2206,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2244,7 +2244,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2252,7 +2252,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2302,7 +2302,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2310,7 +2310,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2364,7 +2364,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2372,7 +2372,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2386,7 +2386,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2394,7 +2394,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2428,7 +2428,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2436,7 +2436,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2466,7 +2466,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2474,7 +2474,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2544,7 +2544,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2552,7 +2552,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2606,7 +2606,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2614,7 +2614,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2664,7 +2664,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2672,11 +2672,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2688,13 +2688,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2702,7 +2702,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2756,7 +2756,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2764,7 +2764,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2790,12 +2790,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2900,12 +2900,12 @@ "cpu-max": 255 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2986,36 +2986,36 @@ "name": "qemu64" } ], - "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" } { "return": [ "passthrough" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3875,12 +3875,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3902,7 +3902,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 961b189a78..fee785692f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -492,7 +492,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -500,12 +500,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -622,12 +622,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3197,7 +3197,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3205,7 +3205,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3433,7 +3433,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3441,7 +3441,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3728,7 +3728,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3736,7 +3736,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3897,7 +3897,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3905,11 +3905,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3921,11 +3921,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3937,11 +3937,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3953,11 +3953,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3969,11 +3969,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3985,7 +3985,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4092,7 +4092,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4100,7 +4100,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4214,7 +4214,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4222,7 +4222,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4298,7 +4298,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4306,11 +4306,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4322,7 +4322,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4391,7 +4391,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4399,7 +4399,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4426,7 +4426,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4434,11 +4434,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4450,11 +4450,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4466,7 +4466,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4539,7 +4539,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4547,11 +4547,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4563,7 +4563,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4620,7 +4620,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4628,7 +4628,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4779,7 +4779,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4787,7 +4787,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4834,7 +4834,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4842,11 +4842,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4858,7 +4858,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5001,7 +5001,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5009,11 +5009,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5025,7 +5025,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5069,7 +5069,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5077,7 +5077,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5157,12 +5157,12 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5429,12 +5429,12 @@ "cpu-max": 1 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5600,34 +5600,34 @@ "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": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -6772,12 +6772,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6827,12 +6827,12 @@ "capability": "return-path" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -16555,12 +16555,12 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16576,7 +16576,7 @@ "kernel": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 80dabec28d..e3047f133e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -489,7 +489,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -497,12 +497,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -619,12 +619,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3298,7 +3298,7 @@ "parent": "7455-family-powerpc64-cpu" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3306,7 +3306,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3534,7 +3534,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3542,7 +3542,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3829,7 +3829,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3837,7 +3837,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3998,7 +3998,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4006,11 +4006,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4022,11 +4022,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4038,11 +4038,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4054,11 +4054,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4070,11 +4070,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4086,7 +4086,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4193,7 +4193,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4201,7 +4201,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4315,7 +4315,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4323,7 +4323,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4399,7 +4399,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4407,11 +4407,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4423,7 +4423,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4492,7 +4492,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4500,7 +4500,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4527,7 +4527,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4535,11 +4535,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4551,11 +4551,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4567,7 +4567,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4640,7 +4640,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4648,11 +4648,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4664,7 +4664,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4721,7 +4721,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4729,7 +4729,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4880,7 +4880,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4888,7 +4888,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4935,7 +4935,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4943,11 +4943,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4959,7 +4959,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5102,7 +5102,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5110,11 +5110,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5126,7 +5126,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5170,7 +5170,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5178,7 +5178,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5258,7 +5258,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5266,7 +5266,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5352,12 +5352,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5475,12 +5475,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -7656,34 +7656,34 @@ "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": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -8823,12 +8823,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -8878,12 +8878,12 @@ "capability": "return-path" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -18606,7 +18606,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 84680be49d..f30a3eaa2b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -501,7 +501,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -509,12 +509,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -631,12 +631,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1538,7 +1538,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1546,7 +1546,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1774,7 +1774,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1782,7 +1782,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2069,7 +2069,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2077,7 +2077,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2238,7 +2238,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2246,7 +2246,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2384,7 +2384,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2392,7 +2392,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2593,7 +2593,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2601,7 +2601,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2676,7 +2676,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2684,11 +2684,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2700,11 +2700,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2716,11 +2716,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2732,7 +2732,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2839,7 +2839,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2847,7 +2847,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2961,7 +2961,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2969,11 +2969,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2985,11 +2985,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3001,11 +3001,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3017,7 +3017,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3044,7 +3044,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3052,11 +3052,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3068,11 +3068,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3084,11 +3084,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3100,7 +3100,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3251,7 +3251,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3259,7 +3259,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3306,7 +3306,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3314,11 +3314,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3330,7 +3330,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3473,7 +3473,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3481,7 +3481,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3543,7 +3543,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3551,7 +3551,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3595,7 +3595,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3603,7 +3603,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3613,12 +3613,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3666,12 +3666,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4205,34 +4205,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" } { @@ -5337,12 +5337,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5392,12 +5392,12 @@ "capability": "return-path" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -15120,7 +15120,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -15131,7 +15131,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15171,7 +15171,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15185,11 +15185,11 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index cff292be8c..b3937c1d9c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -498,7 +498,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -506,12 +506,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -628,12 +628,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2175,7 +2175,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2183,7 +2183,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2411,7 +2411,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2419,7 +2419,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2706,7 +2706,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2714,7 +2714,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2875,7 +2875,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2883,11 +2883,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2899,11 +2899,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2915,11 +2915,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2931,11 +2931,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2947,7 +2947,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3009,7 +3009,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3017,7 +3017,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3124,7 +3124,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3132,7 +3132,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3246,7 +3246,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3254,7 +3254,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3330,7 +3330,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3338,7 +3338,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3401,7 +3401,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3409,7 +3409,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3458,7 +3458,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3466,7 +3466,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3535,7 +3535,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3543,7 +3543,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3570,7 +3570,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3578,7 +3578,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3616,7 +3616,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3624,7 +3624,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3702,7 +3702,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3710,7 +3710,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3783,7 +3783,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3791,7 +3791,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3805,7 +3805,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3813,7 +3813,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3870,7 +3870,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3878,7 +3878,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3921,7 +3921,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3929,7 +3929,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4024,7 +4024,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4032,7 +4032,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4193,7 +4193,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4201,7 +4201,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4258,7 +4258,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4266,7 +4266,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4362,7 +4362,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4370,7 +4370,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4513,7 +4513,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4521,11 +4521,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4537,7 +4537,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4581,7 +4581,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4589,7 +4589,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4669,7 +4669,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4677,7 +4677,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4712,7 +4712,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4720,7 +4720,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4746,12 +4746,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4940,12 +4940,12 @@ "alias": "q35" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5280,36 +5280,36 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -6588,12 +6588,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6643,12 +6643,12 @@ "capability": "return-path" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16371,7 +16371,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16382,7 +16382,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16561,7 +16561,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16742,7 +16742,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16985,7 +16985,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16999,7 +16999,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17178,7 +17178,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17359,7 +17359,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17602,7 +17602,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 1711915888..d47a19130c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -510,7 +510,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -518,12 +518,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -640,12 +640,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1579,7 +1579,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1587,7 +1587,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1815,7 +1815,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1823,7 +1823,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2110,7 +2110,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2118,7 +2118,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2283,7 +2283,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2291,7 +2291,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2429,7 +2429,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2437,7 +2437,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2638,7 +2638,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2646,7 +2646,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2725,7 +2725,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2733,11 +2733,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2749,11 +2749,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2765,11 +2765,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2781,7 +2781,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2893,7 +2893,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2901,7 +2901,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3015,7 +3015,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3023,11 +3023,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3039,11 +3039,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3055,11 +3055,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3071,7 +3071,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3098,7 +3098,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3106,11 +3106,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3122,11 +3122,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3138,11 +3138,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3154,7 +3154,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3305,7 +3305,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3313,7 +3313,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3360,7 +3360,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3368,11 +3368,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3384,7 +3384,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3527,7 +3527,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3535,7 +3535,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3597,7 +3597,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3605,7 +3605,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3649,7 +3649,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3657,7 +3657,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3722,7 +3722,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3730,7 +3730,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3740,12 +3740,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3798,12 +3798,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4337,35 +4337,35 @@ "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": [ "emulator" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5486,12 +5486,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5549,12 +5549,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15422,7 +15422,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15433,7 +15433,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15472,7 +15472,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15486,11 +15486,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 355786cec7..a067b70377 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -507,7 +507,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -515,12 +515,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -637,12 +637,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2168,7 +2168,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2176,7 +2176,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2404,7 +2404,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2412,7 +2412,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2699,7 +2699,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2707,7 +2707,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2872,7 +2872,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2880,11 +2880,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2896,11 +2896,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2912,11 +2912,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2928,11 +2928,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2944,11 +2944,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2960,7 +2960,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3072,7 +3072,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3080,7 +3080,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3194,7 +3194,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3202,7 +3202,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3278,7 +3278,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3286,7 +3286,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3349,7 +3349,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3357,7 +3357,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3406,7 +3406,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3414,7 +3414,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3483,7 +3483,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3491,7 +3491,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3518,7 +3518,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3526,7 +3526,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3568,7 +3568,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3576,7 +3576,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3658,7 +3658,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3666,7 +3666,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3739,7 +3739,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3747,7 +3747,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3761,7 +3761,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3769,7 +3769,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3826,7 +3826,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3834,7 +3834,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3877,7 +3877,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3885,7 +3885,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3980,7 +3980,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3988,7 +3988,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4149,7 +4149,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4157,7 +4157,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4214,7 +4214,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4222,7 +4222,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4318,7 +4318,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4326,7 +4326,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4469,7 +4469,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4477,11 +4477,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4493,7 +4493,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4537,7 +4537,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4545,7 +4545,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4625,7 +4625,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4633,7 +4633,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4668,7 +4668,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4676,7 +4676,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4719,12 +4719,12 @@ "type": "int32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4913,12 +4913,12 @@ "cpu-max": 288 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5232,24 +5232,24 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5257,12 +5257,12 @@ "passthrough", "emulator" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -6557,12 +6557,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6620,12 +6620,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16493,7 +16493,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16504,7 +16504,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16684,7 +16684,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16866,7 +16866,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -17111,7 +17111,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -17125,7 +17125,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17305,7 +17305,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17487,7 +17487,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17732,7 +17732,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index e919c93efa..db5b5140d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -525,7 +525,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -533,12 +533,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -661,12 +661,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3484,7 +3484,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3492,7 +3492,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3724,7 +3724,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3732,7 +3732,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4027,7 +4027,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4035,7 +4035,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4200,7 +4200,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4208,11 +4208,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4224,11 +4224,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4240,11 +4240,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4256,11 +4256,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4272,11 +4272,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4288,7 +4288,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4414,7 +4414,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4422,7 +4422,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4536,7 +4536,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4544,7 +4544,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4620,7 +4620,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4628,11 +4628,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4644,7 +4644,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4713,7 +4713,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4721,7 +4721,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4752,7 +4752,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4760,11 +4760,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4776,11 +4776,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4792,7 +4792,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4865,7 +4865,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4873,11 +4873,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4889,7 +4889,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4946,7 +4946,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4954,7 +4954,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5105,7 +5105,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5113,7 +5113,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5160,7 +5160,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5168,11 +5168,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5184,7 +5184,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5327,7 +5327,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5335,11 +5335,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5351,7 +5351,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5395,7 +5395,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5403,7 +5403,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5483,7 +5483,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5491,7 +5491,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5545,7 +5545,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5553,11 +5553,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5566,7 +5566,7 @@ { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5863,12 +5863,12 @@ "cpu-max": 1 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6044,35 +6044,35 @@ "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": [ "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -7233,12 +7233,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -7300,12 +7300,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -18673,12 +18673,12 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18694,7 +18694,7 @@ "kernel": false } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 343f27576f..786cb1844a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -522,7 +522,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -530,12 +530,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -658,12 +658,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3473,7 +3473,7 @@ "parent": "e500v2-family-powerpc64-cpu" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3481,7 +3481,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3713,7 +3713,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3721,7 +3721,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4016,7 +4016,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4024,7 +4024,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4189,7 +4189,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4197,11 +4197,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4213,11 +4213,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4229,11 +4229,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4245,11 +4245,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4261,11 +4261,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4277,7 +4277,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4403,7 +4403,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4411,7 +4411,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4525,7 +4525,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4533,7 +4533,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4609,7 +4609,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4617,11 +4617,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4633,7 +4633,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4702,7 +4702,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4710,7 +4710,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4741,7 +4741,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4749,11 +4749,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4765,11 +4765,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4781,7 +4781,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4854,7 +4854,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4862,11 +4862,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4878,7 +4878,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4935,7 +4935,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4943,7 +4943,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5094,7 +5094,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5102,7 +5102,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5149,7 +5149,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5157,11 +5157,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5173,7 +5173,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5316,7 +5316,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5324,11 +5324,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5340,7 +5340,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5384,7 +5384,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5392,7 +5392,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5472,7 +5472,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5480,7 +5480,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5538,7 +5538,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5546,7 +5546,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5600,7 +5600,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5608,7 +5608,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5769,12 +5769,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5912,12 +5912,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -8113,35 +8113,35 @@ "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": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -9297,12 +9297,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9364,12 +9364,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -20737,7 +20737,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 2031a692d6..25a005c5cd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -534,7 +534,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -542,12 +542,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -670,12 +670,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1625,7 +1625,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1633,7 +1633,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1865,7 +1865,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1873,7 +1873,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2168,7 +2168,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2176,7 +2176,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2341,7 +2341,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2349,7 +2349,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2491,7 +2491,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2499,7 +2499,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2708,7 +2708,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2716,7 +2716,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2795,7 +2795,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2803,11 +2803,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2819,11 +2819,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2835,11 +2835,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2851,7 +2851,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2977,7 +2977,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2985,7 +2985,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3103,7 +3103,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3111,11 +3111,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3127,11 +3127,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3143,11 +3143,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3159,7 +3159,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3190,7 +3190,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3198,11 +3198,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3214,11 +3214,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3230,11 +3230,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3246,7 +3246,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3397,7 +3397,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3405,7 +3405,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3452,7 +3452,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3460,11 +3460,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3476,7 +3476,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3619,7 +3619,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3627,7 +3627,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3689,7 +3689,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3697,7 +3697,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3741,7 +3741,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3749,7 +3749,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3814,7 +3814,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3822,7 +3822,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3837,7 +3837,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3845,7 +3845,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3899,7 +3899,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3907,11 +3907,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -3920,7 +3920,7 @@ { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3978,12 +3978,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4518,35 +4518,35 @@ "migration-safe": true } ], - "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": [ "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5671,12 +5671,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5738,12 +5738,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -17111,7 +17111,7 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -17122,7 +17122,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17160,7 +17160,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17174,11 +17174,11 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { - "id": "libvirt-45", + "id": "libvirt-44", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 3d900d827a..9d7e653216 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -540,7 +540,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -548,12 +548,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -676,12 +676,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2331,7 +2331,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2339,7 +2339,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2571,7 +2571,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2579,7 +2579,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2874,7 +2874,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2882,7 +2882,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3047,7 +3047,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3055,11 +3055,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3071,11 +3071,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3087,11 +3087,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3103,11 +3103,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3119,11 +3119,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3135,7 +3135,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3261,7 +3261,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3269,7 +3269,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3383,7 +3383,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3391,7 +3391,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3467,7 +3467,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3475,7 +3475,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3538,7 +3538,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3546,7 +3546,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3595,7 +3595,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3603,7 +3603,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3672,7 +3672,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3680,7 +3680,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3711,7 +3711,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3719,7 +3719,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3761,7 +3761,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3769,7 +3769,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3851,7 +3851,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3859,7 +3859,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3932,7 +3932,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3940,7 +3940,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3954,7 +3954,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3962,7 +3962,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4019,7 +4019,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4027,7 +4027,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4070,7 +4070,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4078,7 +4078,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4173,7 +4173,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4181,7 +4181,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4332,7 +4332,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4340,7 +4340,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4387,7 +4387,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4395,7 +4395,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4491,7 +4491,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4499,7 +4499,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4642,7 +4642,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4650,11 +4650,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4666,7 +4666,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4710,7 +4710,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4718,7 +4718,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4798,7 +4798,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4806,7 +4806,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4845,7 +4845,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4853,7 +4853,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4896,7 +4896,7 @@ "type": "int32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4904,7 +4904,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4958,7 +4958,7 @@ "type": "string" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4966,11 +4966,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -4979,7 +4979,7 @@ { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5178,12 +5178,12 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5697,12 +5697,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5710,12 +5710,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5723,12 +5723,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -7015,12 +7015,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7082,12 +7082,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-qmp-schema", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -18455,7 +18455,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -18466,7 +18466,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18656,7 +18656,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18848,7 +18848,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19103,7 +19103,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19117,7 +19117,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19307,7 +19307,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19499,7 +19499,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19754,12 +19754,12 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { "execute": "query-sev-capabilities", - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -19769,7 +19769,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-53" + "id": "libvirt-52" } { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index 39fdf0c792..32c31f406d 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -432,11 +432,11 @@ "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "DeviceNotFound", "desc": "Device 'bogus' not found" @@ -445,7 +445,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -453,12 +453,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -569,12 +569,12 @@ "name": "BLOCK_IMAGE_CORRUPTED" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1462,7 +1462,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1470,7 +1470,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1622,7 +1622,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1630,7 +1630,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1843,7 +1843,7 @@ "type": "bool" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1851,7 +1851,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1954,7 +1954,7 @@ "type": "bool" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1962,11 +1962,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1978,11 +1978,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1994,11 +1994,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2010,11 +2010,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2026,7 +2026,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2078,7 +2078,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2086,7 +2086,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2142,7 +2142,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2150,7 +2150,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2245,7 +2245,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2253,7 +2253,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2310,7 +2310,7 @@ "type": "str" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2318,7 +2318,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2371,7 +2371,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2379,7 +2379,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2420,7 +2420,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2428,7 +2428,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2493,7 +2493,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2501,7 +2501,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2528,7 +2528,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2536,7 +2536,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2574,7 +2574,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2582,7 +2582,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2636,7 +2636,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2644,7 +2644,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2704,7 +2704,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2712,7 +2712,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2726,7 +2726,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2734,7 +2734,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2781,7 +2781,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2789,7 +2789,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2822,7 +2822,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2830,7 +2830,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2907,7 +2907,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2915,7 +2915,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2996,7 +2996,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3004,7 +3004,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3034,7 +3034,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3042,7 +3042,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3119,7 +3119,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3127,7 +3127,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3212,7 +3212,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3220,11 +3220,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3236,7 +3236,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3275,7 +3275,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3283,7 +3283,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3353,7 +3353,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3361,7 +3361,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3371,7 +3371,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3379,7 +3379,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3405,12 +3405,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3539,12 +3539,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3634,36 +3634,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4671,12 +4671,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -4706,7 +4706,7 @@ "capability": "events" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 9f2ed91843..2e93b116f7 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -456,7 +456,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -464,12 +464,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -580,12 +580,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1491,7 +1491,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1499,7 +1499,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1661,7 +1661,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1669,7 +1669,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1897,7 +1897,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1905,7 +1905,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2023,7 +2023,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2031,11 +2031,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2047,11 +2047,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2063,11 +2063,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2079,11 +2079,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2095,7 +2095,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2147,7 +2147,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2155,7 +2155,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2239,7 +2239,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2247,7 +2247,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2342,7 +2342,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2350,7 +2350,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2407,7 +2407,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2415,7 +2415,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2468,7 +2468,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2476,7 +2476,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2517,7 +2517,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2525,7 +2525,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2590,7 +2590,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2598,7 +2598,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2625,7 +2625,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2633,7 +2633,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2671,7 +2671,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2679,7 +2679,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2733,7 +2733,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2741,7 +2741,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2801,7 +2801,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2809,7 +2809,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2823,7 +2823,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2831,7 +2831,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2878,7 +2878,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2886,7 +2886,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2919,7 +2919,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2927,7 +2927,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3004,7 +3004,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3012,7 +3012,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3118,7 +3118,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3126,7 +3126,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3166,7 +3166,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3174,7 +3174,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3251,7 +3251,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3259,7 +3259,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3359,7 +3359,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3367,11 +3367,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3383,7 +3383,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3422,7 +3422,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3430,7 +3430,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3500,7 +3500,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3508,7 +3508,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3518,7 +3518,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3526,7 +3526,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3552,12 +3552,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3694,12 +3694,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3789,36 +3789,36 @@ "name": "qemu64" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -4863,12 +4863,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4902,12 +4902,12 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -12452,7 +12452,7 @@ "meta-type": "array" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index da3ee9ffe3..41a2be3a2f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -459,7 +459,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -467,12 +467,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -589,12 +589,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2250,7 +2250,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2258,7 +2258,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2420,7 +2420,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2428,7 +2428,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2656,7 +2656,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2664,7 +2664,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2782,7 +2782,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2790,11 +2790,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2806,11 +2806,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2822,11 +2822,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2838,11 +2838,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2854,11 +2854,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2870,7 +2870,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2958,7 +2958,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2966,7 +2966,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3061,7 +3061,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3069,7 +3069,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3126,7 +3126,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3134,11 +3134,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3150,7 +3150,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3215,7 +3215,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3223,7 +3223,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3250,7 +3250,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3258,11 +3258,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3274,11 +3274,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3290,7 +3290,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3350,7 +3350,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3358,11 +3358,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3374,7 +3374,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3421,7 +3421,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3429,7 +3429,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3525,7 +3525,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3533,7 +3533,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3563,7 +3563,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3571,11 +3571,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3587,7 +3587,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3687,7 +3687,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3695,11 +3695,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3711,7 +3711,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3750,7 +3750,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3758,7 +3758,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3828,12 +3828,12 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4008,12 +4008,12 @@ "cpu-max": 1 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4112,34 +4112,34 @@ "name": "pxa270" } ], - "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" } { @@ -5111,12 +5111,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5150,12 +5150,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13160,12 +13160,12 @@ "meta-type": "array" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13181,7 +13181,7 @@ "kernel": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index fb710d0a6f..4a35fee5ed 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -456,7 +456,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -464,12 +464,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -586,12 +586,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2400,7 +2400,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2408,7 +2408,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2570,7 +2570,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2578,7 +2578,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2806,7 +2806,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2814,7 +2814,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2932,7 +2932,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2940,11 +2940,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2956,11 +2956,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2972,11 +2972,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2988,11 +2988,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3004,11 +3004,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3020,7 +3020,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3108,7 +3108,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3116,7 +3116,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3211,7 +3211,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3219,7 +3219,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3276,7 +3276,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3284,11 +3284,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3300,7 +3300,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3365,7 +3365,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3373,7 +3373,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3400,7 +3400,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3408,11 +3408,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3424,11 +3424,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3440,7 +3440,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3500,7 +3500,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3508,11 +3508,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3524,7 +3524,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3571,7 +3571,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3579,7 +3579,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3675,7 +3675,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3683,7 +3683,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3713,7 +3713,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3721,11 +3721,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3737,7 +3737,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3837,7 +3837,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3845,11 +3845,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3861,7 +3861,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3900,7 +3900,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3908,7 +3908,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3978,7 +3978,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3986,7 +3986,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4032,12 +4032,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4109,12 +4109,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5416,34 +5416,34 @@ "name": "MPC8541E_v11" } ], - "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" } { @@ -6410,12 +6410,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6449,12 +6449,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14459,7 +14459,7 @@ "meta-type": "array" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index 626d43d3e8..382feee693 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -462,7 +462,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -470,12 +470,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -592,12 +592,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1569,7 +1569,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1577,7 +1577,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1739,7 +1739,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1747,7 +1747,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1975,7 +1975,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1983,7 +1983,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2101,7 +2101,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2109,11 +2109,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2125,11 +2125,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2141,11 +2141,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2157,11 +2157,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2173,7 +2173,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2225,7 +2225,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2233,7 +2233,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2321,7 +2321,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2329,7 +2329,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2424,7 +2424,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2432,7 +2432,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2489,7 +2489,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2497,7 +2497,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2550,7 +2550,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2558,7 +2558,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2599,7 +2599,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2607,7 +2607,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2672,7 +2672,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2680,7 +2680,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2707,7 +2707,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2715,7 +2715,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2753,7 +2753,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2761,7 +2761,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2815,7 +2815,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2823,7 +2823,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2883,7 +2883,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2891,7 +2891,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2905,7 +2905,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2913,7 +2913,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2960,7 +2960,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2968,7 +2968,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3001,7 +3001,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3009,7 +3009,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3086,7 +3086,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3094,7 +3094,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3200,7 +3200,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3208,7 +3208,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3248,7 +3248,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3256,7 +3256,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3333,7 +3333,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3341,7 +3341,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3441,7 +3441,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3449,11 +3449,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3465,7 +3465,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3504,7 +3504,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3512,7 +3512,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3582,7 +3582,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3590,7 +3590,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3600,7 +3600,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3608,7 +3608,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3634,12 +3634,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3752,12 +3752,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3847,36 +3847,36 @@ "name": "qemu64" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -4970,12 +4970,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5009,12 +5009,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -13019,7 +13019,7 @@ "meta-type": "array" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 2eb9ecd86c..977c591455 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -468,7 +468,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -476,12 +476,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -598,12 +598,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -981,7 +981,7 @@ "name": "s390-skeys-kvm" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -989,7 +989,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1174,7 +1174,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1182,7 +1182,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1414,7 +1414,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1422,7 +1422,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1544,7 +1544,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1552,7 +1552,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1681,7 +1681,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1689,7 +1689,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1869,7 +1869,7 @@ "type": "bool" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1877,7 +1877,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1947,7 +1947,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1955,11 +1955,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1971,11 +1971,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1987,11 +1987,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2003,7 +2003,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2105,7 +2105,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2113,7 +2113,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2223,7 +2223,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2231,11 +2231,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2247,11 +2247,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2263,11 +2263,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2279,7 +2279,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2306,7 +2306,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2314,11 +2314,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2330,11 +2330,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2346,11 +2346,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2362,7 +2362,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2462,7 +2462,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2470,7 +2470,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2500,7 +2500,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2508,11 +2508,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2524,7 +2524,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2628,7 +2628,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2636,7 +2636,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2693,7 +2693,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2701,7 +2701,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2740,7 +2740,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2748,7 +2748,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2758,12 +2758,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -2796,12 +2796,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2810,34 +2810,34 @@ "name": "host" } ], - "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" } { @@ -3773,12 +3773,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3812,12 +3812,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -12173,7 +12173,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 79fed5c27b..aae2b3f4de 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -471,7 +471,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -479,12 +479,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -601,12 +601,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1593,7 +1593,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1601,7 +1601,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1786,7 +1786,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1794,7 +1794,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2026,7 +2026,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2034,7 +2034,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2156,7 +2156,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2164,11 +2164,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2180,11 +2180,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2196,11 +2196,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2212,11 +2212,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2228,7 +2228,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2285,7 +2285,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2293,7 +2293,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2395,7 +2395,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2403,7 +2403,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2513,7 +2513,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2521,7 +2521,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2593,7 +2593,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2601,7 +2601,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2659,7 +2659,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2667,7 +2667,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2716,7 +2716,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2724,7 +2724,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2793,7 +2793,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2801,7 +2801,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2828,7 +2828,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2836,7 +2836,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2874,7 +2874,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2882,7 +2882,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2960,7 +2960,7 @@ "type": "int" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2968,7 +2968,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3037,7 +3037,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3045,7 +3045,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3059,7 +3059,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3067,7 +3067,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3119,7 +3119,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3127,7 +3127,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3165,7 +3165,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3173,7 +3173,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3255,7 +3255,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3263,7 +3263,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3373,7 +3373,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3381,7 +3381,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3421,7 +3421,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3429,7 +3429,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3515,7 +3515,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3523,7 +3523,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3627,7 +3627,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3635,11 +3635,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3651,7 +3651,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3690,7 +3690,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3698,7 +3698,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3773,7 +3773,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3781,7 +3781,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3795,7 +3795,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3803,7 +3803,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3829,12 +3829,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3983,12 +3983,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4081,36 +4081,36 @@ "name": "qemu64" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5208,12 +5208,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5247,12 +5247,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -13608,7 +13608,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 2f0f90ce0c..6eae79342e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -480,7 +480,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -488,12 +488,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -610,12 +610,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1221,7 +1221,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1229,7 +1229,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1419,7 +1419,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1427,7 +1427,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1668,7 +1668,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1676,7 +1676,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1803,7 +1803,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1811,7 +1811,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1940,7 +1940,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1948,7 +1948,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2132,7 +2132,7 @@ "type": "bool" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2140,7 +2140,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2210,7 +2210,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2218,11 +2218,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2234,11 +2234,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2250,11 +2250,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2266,7 +2266,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2368,7 +2368,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2376,7 +2376,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2486,7 +2486,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2494,11 +2494,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2510,11 +2510,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2526,11 +2526,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2542,7 +2542,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2569,7 +2569,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2577,11 +2577,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2593,11 +2593,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2609,11 +2609,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2625,7 +2625,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2730,7 +2730,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2738,7 +2738,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2768,7 +2768,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2776,11 +2776,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2792,7 +2792,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2901,7 +2901,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2909,7 +2909,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2966,7 +2966,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2974,7 +2974,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3013,7 +3013,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3021,7 +3021,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3031,12 +3031,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3074,12 +3074,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3405,34 +3405,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" } { @@ -4393,12 +4393,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4436,12 +4436,12 @@ "capability": "x-colo" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -13211,7 +13211,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -13222,7 +13222,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13248,7 +13248,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13262,11 +13262,11 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index 2edc628898..dcfa7ea056 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -474,7 +474,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -482,12 +482,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -604,12 +604,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1677,7 +1677,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1685,7 +1685,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1879,7 +1879,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1887,7 +1887,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2132,7 +2132,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2140,7 +2140,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2271,7 +2271,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2279,11 +2279,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2295,11 +2295,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2311,11 +2311,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2327,11 +2327,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2343,7 +2343,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2400,7 +2400,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2408,7 +2408,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2510,7 +2510,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2518,7 +2518,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2628,7 +2628,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2636,7 +2636,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2708,7 +2708,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2716,7 +2716,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2774,7 +2774,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2782,7 +2782,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2831,7 +2831,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2839,7 +2839,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2908,7 +2908,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2916,7 +2916,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2943,7 +2943,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2951,7 +2951,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2989,7 +2989,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2997,7 +2997,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3075,7 +3075,7 @@ "type": "int" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3083,7 +3083,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3152,7 +3152,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3160,7 +3160,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3174,7 +3174,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3182,7 +3182,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3234,7 +3234,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3242,7 +3242,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3280,7 +3280,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3288,7 +3288,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3370,7 +3370,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3378,7 +3378,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3497,7 +3497,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3505,7 +3505,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3545,7 +3545,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3553,7 +3553,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3639,7 +3639,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3647,7 +3647,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3760,7 +3760,7 @@ "type": "guest statistics" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3768,11 +3768,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3784,7 +3784,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3823,7 +3823,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3831,7 +3831,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3906,7 +3906,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3914,7 +3914,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3937,7 +3937,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3945,7 +3945,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3971,12 +3971,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4145,12 +4145,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4356,36 +4356,36 @@ "static": false } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5508,12 +5508,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5551,12 +5551,12 @@ "capability": "x-colo" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -14326,7 +14326,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index 977f60078f..f98ed20a6b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -480,7 +480,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -488,12 +488,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -610,12 +610,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2565,7 +2565,7 @@ "name": "7457A_v1.2-powerpc64-cpu" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2573,7 +2573,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2801,7 +2801,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2809,7 +2809,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3088,7 +3088,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3096,7 +3096,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3257,7 +3257,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3265,11 +3265,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3281,11 +3281,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3297,11 +3297,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3313,11 +3313,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3329,11 +3329,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3345,7 +3345,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3452,7 +3452,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3460,7 +3460,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3574,7 +3574,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3582,7 +3582,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3658,7 +3658,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3666,11 +3666,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3682,11 +3682,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3698,7 +3698,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3725,7 +3725,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3733,11 +3733,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3749,11 +3749,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3765,7 +3765,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3838,7 +3838,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3846,11 +3846,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3862,7 +3862,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3919,7 +3919,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3927,7 +3927,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4070,7 +4070,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4078,7 +4078,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4117,7 +4117,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4125,11 +4125,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4141,7 +4141,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4284,7 +4284,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4292,11 +4292,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4308,7 +4308,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4352,7 +4352,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4360,7 +4360,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4440,7 +4440,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4448,7 +4448,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4534,12 +4534,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4652,12 +4652,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -6833,34 +6833,34 @@ "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": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -7970,12 +7970,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -8017,12 +8017,12 @@ "capability": "release-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -17308,7 +17308,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 1e2a93ff0a..d3b60da4bf 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -492,7 +492,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -500,12 +500,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -622,12 +622,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1269,7 +1269,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1277,7 +1277,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1505,7 +1505,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1513,7 +1513,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1792,7 +1792,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1800,7 +1800,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1961,7 +1961,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1969,7 +1969,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2107,7 +2107,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2115,7 +2115,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2308,7 +2308,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2316,7 +2316,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2391,7 +2391,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2399,11 +2399,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2415,11 +2415,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2431,11 +2431,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2447,7 +2447,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2554,7 +2554,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2562,7 +2562,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2676,7 +2676,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2684,11 +2684,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2700,11 +2700,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2716,11 +2716,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2732,7 +2732,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2759,7 +2759,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2767,11 +2767,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2783,11 +2783,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2799,11 +2799,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2815,7 +2815,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2958,7 +2958,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2966,7 +2966,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3005,7 +3005,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3013,11 +3013,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3029,7 +3029,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3172,7 +3172,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3180,7 +3180,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3242,7 +3242,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3250,7 +3250,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3294,7 +3294,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3302,7 +3302,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3312,12 +3312,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3360,12 +3360,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3755,34 +3755,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" } { @@ -4857,12 +4857,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4904,12 +4904,12 @@ "capability": "release-ram" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -14195,7 +14195,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -14206,7 +14206,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14233,7 +14233,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14247,11 +14247,11 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index a55a4a111a..c3edcc187d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -489,7 +489,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -497,12 +497,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -619,12 +619,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1755,7 +1755,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1763,7 +1763,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1991,7 +1991,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1999,7 +1999,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2278,7 +2278,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2286,7 +2286,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2447,7 +2447,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2455,11 +2455,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2471,11 +2471,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2487,11 +2487,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2503,11 +2503,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2519,7 +2519,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2581,7 +2581,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2589,7 +2589,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2696,7 +2696,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2704,7 +2704,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2818,7 +2818,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2826,7 +2826,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2902,7 +2902,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2910,7 +2910,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2973,7 +2973,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2981,7 +2981,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3030,7 +3030,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3038,7 +3038,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3107,7 +3107,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3115,7 +3115,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3142,7 +3142,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3150,7 +3150,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3188,7 +3188,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3196,7 +3196,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3274,7 +3274,7 @@ "type": "int" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3282,7 +3282,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3355,7 +3355,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3363,7 +3363,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3377,7 +3377,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3385,7 +3385,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3442,7 +3442,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3450,7 +3450,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3493,7 +3493,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3501,7 +3501,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3588,7 +3588,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3596,7 +3596,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3749,7 +3749,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3757,7 +3757,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3806,7 +3806,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3814,7 +3814,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3910,7 +3910,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3918,7 +3918,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4061,7 +4061,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4069,11 +4069,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4085,7 +4085,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4129,7 +4129,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4137,7 +4137,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4217,7 +4217,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4225,7 +4225,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4256,7 +4256,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4264,7 +4264,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4290,12 +4290,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4474,12 +4474,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4761,36 +4761,36 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -6039,12 +6039,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6086,12 +6086,12 @@ "capability": "release-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -15377,7 +15377,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -15388,7 +15388,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15567,7 +15567,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15748,7 +15748,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -15989,7 +15989,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16003,7 +16003,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16182,7 +16182,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16363,7 +16363,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -16604,7 +16604,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index cf1a8bfe3d..932c418f3f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -567,7 +567,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -575,12 +575,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -706,12 +706,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3553,7 +3553,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3561,7 +3561,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3793,7 +3793,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3801,7 +3801,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4091,7 +4091,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4099,7 +4099,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4264,7 +4264,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4272,11 +4272,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4288,11 +4288,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4304,11 +4304,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4320,11 +4320,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4336,11 +4336,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4352,7 +4352,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4486,7 +4486,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4494,7 +4494,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4612,7 +4612,7 @@ "type": "uint32" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4620,7 +4620,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4696,7 +4696,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4704,11 +4704,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4720,7 +4720,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4789,7 +4789,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4797,7 +4797,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4828,7 +4828,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4836,11 +4836,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4852,11 +4852,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4868,7 +4868,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4941,7 +4941,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4949,11 +4949,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4965,7 +4965,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -5022,7 +5022,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -5030,7 +5030,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5181,7 +5181,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5189,7 +5189,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5236,7 +5236,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5244,11 +5244,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5260,7 +5260,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5403,7 +5403,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5411,11 +5411,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5427,7 +5427,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5471,7 +5471,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5479,7 +5479,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5559,7 +5559,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5567,7 +5567,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5625,7 +5625,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5633,7 +5633,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5683,7 +5683,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5691,7 +5691,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5862,12 +5862,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6010,12 +6010,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -8211,35 +8211,35 @@ "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": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -9369,12 +9369,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9444,12 +9444,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -21608,7 +21608,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index d6e0967172..fdab682f94 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -585,7 +585,7 @@ { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -593,12 +593,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -727,12 +727,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2398,7 +2398,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2406,7 +2406,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2638,7 +2638,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2646,7 +2646,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2936,7 +2936,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2944,7 +2944,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3109,7 +3109,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3117,11 +3117,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3133,11 +3133,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3149,11 +3149,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3165,11 +3165,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3181,11 +3181,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3197,7 +3197,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3331,7 +3331,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3339,7 +3339,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3457,7 +3457,7 @@ "type": "uint32" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3465,7 +3465,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3541,7 +3541,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3549,7 +3549,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3612,7 +3612,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3620,7 +3620,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3669,7 +3669,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3677,7 +3677,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3746,7 +3746,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3754,7 +3754,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3785,7 +3785,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3793,7 +3793,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3835,7 +3835,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3843,7 +3843,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3925,7 +3925,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3933,7 +3933,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4016,7 +4016,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4024,7 +4024,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4038,7 +4038,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4046,7 +4046,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4107,7 +4107,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4115,7 +4115,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4162,7 +4162,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4170,7 +4170,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4269,7 +4269,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4277,7 +4277,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4438,7 +4438,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4446,7 +4446,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4503,7 +4503,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4511,7 +4511,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4607,7 +4607,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4615,7 +4615,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4758,7 +4758,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4766,11 +4766,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4782,7 +4782,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4826,7 +4826,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4834,7 +4834,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4914,7 +4914,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4922,7 +4922,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4961,7 +4961,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4969,7 +4969,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5012,7 +5012,7 @@ "type": "int32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5020,7 +5020,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5070,7 +5070,7 @@ "type": "string" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5078,11 +5078,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5091,7 +5091,7 @@ { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5300,12 +5300,12 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5742,12 +5742,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5755,12 +5755,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5768,12 +5768,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -7072,12 +7072,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7147,12 +7147,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-qmp-schema", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19032,7 +19032,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19043,7 +19043,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19236,7 +19236,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19431,7 +19431,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19694,7 +19694,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19708,7 +19708,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19901,7 +19901,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -20096,7 +20096,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -20359,16 +20359,16 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { "execute": "query-sev-capabilities", - "id": "libvirt-53" + "id": "libvirt-52" } { - "id": "libvirt-53", + "id": "libvirt-52", "error": { "class": "GenericError", "desc": "SEV feature is not available" -- 2.16.2
On 08/15/2018 05:18 AM, Peter Krempa wrote:
Split up for simpler reviews. --- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 152 ++++++++-------- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 152 ++++++++-------- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 152 ++++++++-------- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 152 ++++++++-------- .../caps_2.10.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 148 ++++++++-------- .../caps_2.10.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 152 ++++++++-------- .../caps_2.11.0.x86_64.replies | 180 +++++++++---------- .../caps_2.12.0.aarch64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 160 ++++++++--------- .../caps_2.12.0.x86_64.replies | 192 ++++++++++----------- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 164 +++++++++--------- .../caps_2.6.0.aarch64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 140 +++++++-------- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 164 +++++++++--------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 148 ++++++++-------- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 180 +++++++++---------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 156 ++++++++--------- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 192 ++++++++++----------- 28 files changed, 2228 insertions(+), 2228 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John
participants (2)
-
John Ferlan -
Peter Krempa