[libvirt] [RFC PATCH 0/9] tests: Record commands used to gather capability replies
De-confusify the 'replies' files for human usage by recording which commands were used for gathering given block. Additionally this tests that the commands emitted by libvirt are as recorded. This series is in RFC state, since it creates some churn in the capability files and also 'tests/qemucapsfixreplies' will no longer work. Patch 8 contains the changed files for ease of review and patch 9 contains the tool used to regenerate them from the current state. Peter Krempa (9): qemu: monitor: Add possibility to reset command sequence in tests tests: qemumonitor: Simplify handling of end of file in full file test tests: qemumonitor: Optimize control flow when concatenating replies tests: qemucapsprobemock: Simplify and extract skipping of empty lines tests: qemucapsprobemock: Fail if JSON reply from qemu can't be reformatted tests: qemucapsprobemock: Prepare 'qemucapsprobe' for the new format tests: qemucapabilities: Test commands used to query capabilities FIXUP: Tweak capability files to conform to the new approach DO_NOT_APPLY: HACK: Regenerate qemucapabilitiestest data fix-files.sh | 1 + src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_priv.h | 31 + tests/Makefile.am | 1 + .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 350 +++++- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 328 +++++- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 331 +++++- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 358 +++++- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 1173 +++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 341 +++++- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 306 ++++- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 17 +- tests/qemucapsprobemock.c | 77 +- tests/qemumonitortestutils.c | 52 +- 57 files changed, 10564 insertions(+), 385 deletions(-) create mode 100755 fix-files.sh create mode 100644 src/qemu/qemu_monitor_priv.h -- 2.16.2
qemucapabilitiestest for simplicity uses one test monitor object for simulating work of two separate inquiries of the qemu process. To allow better testing in the future it will be required to reset the counter so that it accurately simulates how qemu would behave. This patch adds a private monitor API which allows to reset the counter which will be usable only in tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 11 +++++++++++ src/qemu/qemu_monitor_priv.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/qemu/qemu_monitor_priv.h diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 43f1d2f816..2405c77f17 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -48,6 +48,9 @@ # include "libvirt_qemu_probes.h" #endif +#define __QEMU_MONITOR_PRIV_H_ALLOW__ +#include "qemu_monitor_priv.h" + #define VIR_FROM_THIS VIR_FROM_QEMU VIR_LOG_INIT("qemu.qemu_monitor"); @@ -1037,6 +1040,14 @@ qemuMonitorNextCommandID(qemuMonitorPtr mon) } +/* for use only in the test suite */ +void +qemuMonitorResetCommandID(qemuMonitorPtr mon) +{ + mon->nextSerial = 0; +} + + int qemuMonitorSend(qemuMonitorPtr mon, qemuMonitorMessagePtr msg) diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h new file mode 100644 index 0000000000..45bda27c0f --- /dev/null +++ b/src/qemu/qemu_monitor_priv.h @@ -0,0 +1,31 @@ +/* + * qemu_monitor_priv.h: interaction with QEMU monitor console (private) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef __QEMU_MONITOR_PRIV_H_ALLOW__ +# error "qemu_monitor_priv.h may only be included by qemu_monitor.c or test suites" +#endif + +#ifndef __QEMU_MONITOR_PRIV_H__ +# define __QEMU_MONITOR_PRIV_H__ + +# include "qemu_monitor.h" + +void +qemuMonitorResetCommandID(qemuMonitorPtr mon); + +#endif -- 2.16.2
On EOF, the loop can be terminated right away since most of it is skipped anyways and the handling of the last command is repeated after the loop. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemumonitortestutils.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 62f68ee699..a73272e7b0 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1416,9 +1416,12 @@ qemuMonitorTestNewFromFileFull(const char *fileName, tmp = jsonstr; command = tmp; while ((tmp = strchr(tmp, '\n'))) { - bool eof = !tmp[1]; line++; + /* eof */ + if (!tmp[1]) + break; + if (*(tmp + 1) != '\n') { *tmp = ' '; tmp++; @@ -1434,21 +1437,16 @@ qemuMonitorTestNewFromFileFull(const char *fileName, response = NULL; } - if (!eof) { - /* Move the @tmp and @singleReply. */ - tmp += 2; + /* Move the @tmp and @singleReply. */ + tmp += 2; - if (!command) { - commandln = line; - command = tmp; - } else { - response = tmp; - } + if (!command) { + commandln = line; + command = tmp; + } else { + response = tmp; } } - - if (eof) - break; } if (command) { -- 2.16.2
The test file can be broken up by newlines and is automatically concatenated back. Fix the control flow so that the concatenation code 'continues' the loop rather than branching out. Also add an anotation to the concatenation code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemumonitortestutils.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index a73272e7b0..98c6ce6187 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1422,30 +1422,32 @@ qemuMonitorTestNewFromFileFull(const char *fileName, if (!tmp[1]) break; + /* concatenate block which was broken up for readability */ if (*(tmp + 1) != '\n') { *tmp = ' '; tmp++; + continue; + } + + /* Cut off a single reply. */ + *(tmp + 1) = '\0'; + + if (response) { + if (qemuMonitorTestFullAddItem(ret, fileName, command, + response, commandln) < 0) + goto error; + command = NULL; + response = NULL; + } + + /* Move the @tmp and @singleReply. */ + tmp += 2; + + if (!command) { + commandln = line; + command = tmp; } else { - /* Cut off a single reply. */ - *(tmp + 1) = '\0'; - - if (response) { - if (qemuMonitorTestFullAddItem(ret, fileName, command, - response, commandln) < 0) - goto error; - command = NULL; - response = NULL; - } - - /* Move the @tmp and @singleReply. */ - tmp += 2; - - if (!command) { - commandln = line; - command = tmp; - } else { - response = tmp; - } + response = tmp; } } -- 2.16.2
The prettyfied output may sometimes contain empty lines which would desynchonize the test monitor workers. The skipping code can be much simplified though. Also a extract it so so that it's obvious what it's doing and can be reused. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapsprobemock.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index 97497eb438..f26fa6b285 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -38,6 +38,21 @@ } while (0) +static void +printLineSkipEmpty(const char *line, + FILE *fp) +{ + const char *p; + + for (p = line; *p; p++) { + if (p[0] == '\n' && p[1] == '\n') + continue; + + fputc(*p, fp); + } +} + + static int (*realQemuMonitorSend)(qemuMonitorPtr mon, qemuMonitorMessagePtr msg); @@ -74,8 +89,6 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, if (ret == 0 && (value = virJSONValueFromString(line)) && (json = virJSONValueToString(value, 1))) { - char *p; - bool skip = false; if (first) { first = false; @@ -86,14 +99,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, putchar('\n'); } - for (p = json; *p; p++) { - if (skip && *p == '\n') { - continue; - } else { - skip = *p == '\n'; - putchar(*p); - } - } + printLineSkipEmpty(json, stdout); } cleanup: -- 2.16.2
Rather than skipping output on failure fail loudly. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapsprobemock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index f26fa6b285..a0d2acb69a 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -86,9 +86,12 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, ret = realQemuMonitorJSONIOProcessLine(mon, line, msg); - if (ret == 0 && - (value = virJSONValueFromString(line)) && - (json = virJSONValueToString(value, 1))) { + if (ret == 0) { + if (!(value = virJSONValueFromString(line)) || + !(json = virJSONValueToString(value, true))) { + fprintf(stderr, "Failed to reformat reply string '%s'\n", line); + abort(); + } if (first) { first = false; -- 2.16.2
Change the output of qemucapsprobe to record the commands used for querying. This allows to easily identify which reply belongs to which command and also will allow to test whether we use stable queries. This change includes changing dropping of the QMP greeting from the file and reformatting of the query and output to stdout. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapsprobemock.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index a0d2acb69a..5936975505 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -37,6 +37,7 @@ } \ } while (0) +static bool first = true; static void printLineSkipEmpty(const char *line, @@ -60,9 +61,22 @@ int qemuMonitorSend(qemuMonitorPtr mon, qemuMonitorMessagePtr msg) { + char *reformatted; + REAL_SYM(realQemuMonitorSend); - fprintf(stderr, "%s", msg->txBuffer); + if (!(reformatted = virJSONStringReformat(msg->txBuffer, true))) { + fprintf(stderr, "Failed to reformat command string '%s'\n", msg->txBuffer); + abort(); + } + + if (first) + first = false; + else + printLineSkipEmpty("\n", stdout); + + printLineSkipEmpty(reformatted, stdout); + VIR_FREE(reformatted); return realQemuMonitorSend(mon, msg); } @@ -77,7 +91,6 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, const char *line, qemuMonitorMessagePtr msg) { - static bool first = true; virJSONValuePtr value = NULL; char *json = NULL; int ret; @@ -93,14 +106,14 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, abort(); } - if (first) { + /* Ignore QMP greeting */ + if (virJSONValueObjectHasKey(value, "QMP")) + goto cleanup; + + if (first) first = false; - } else { - /* Ignore QMP greeting if it's not the first one */ - if (virJSONValueObjectHasKey(value, "QMP")) - goto cleanup; - putchar('\n'); - } + else + printLineSkipEmpty("\n", stdout); printLineSkipEmpty(json, stdout); } -- 2.16.2
Use qemuMonitorTestNewFromFileFull which allows to test commands used along with providing replies. This has two advantages: 1) It's easier to see which command was used when looking at the files 2) We check that the used commands are actually in the correct order Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapabilitiestest.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 5a42a35c11..cf94bc9d36 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -30,7 +30,7 @@ typedef struct _testQemuData testQemuData; typedef testQemuData *testQemuDataPtr; struct _testQemuData { - virDomainXMLOptionPtr xmlopt; + virQEMUDriver driver; const char *archName; const char *base; }; @@ -40,7 +40,7 @@ static int testQemuCaps(const void *opaque) { int ret = -1; - const testQemuData *data = opaque; + testQemuData *data = (void *) opaque; char *repliesFile = NULL; char *capsFile = NULL; qemuMonitorTestPtr mon = NULL; @@ -53,7 +53,7 @@ testQemuCaps(const void *opaque) abs_srcdir, data->base, data->archName) < 0) goto cleanup; - if (!(mon = qemuMonitorTestNewFromFile(repliesFile, data->xmlopt, false))) + if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL))) goto cleanup; if (!(capsActual = virQEMUCapsNew()) || @@ -136,7 +136,6 @@ static int mymain(void) { int ret = 0; - virQEMUDriver driver; testQemuData data; #if !WITH_YAJL @@ -145,13 +144,11 @@ mymain(void) #endif if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + qemuTestDriverInit(&data.driver) < 0) return EXIT_FAILURE; virEventRegisterDefaultImpl(); - data.xmlopt = driver.xmlopt; - #define DO_TEST(arch, name) \ do { \ data.archName = arch; \ @@ -197,7 +194,7 @@ mymain(void) * "tests/qemucapsfixreplies foo.replies" to fix the replies ids. */ - qemuTestDriverFree(&driver); + qemuTestDriverFree(&data.driver); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.16.2
This is supposed to be squashed in into the previous patch. The files were regenerated by instrumenting the qemucapabilitiestest with the LD_PRELOAD hack used to gather the data in qemucapsprobe. See next patch --- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 350 +++++- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 328 +++++- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 331 +++++- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 358 +++++- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 1173 +++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 341 +++++- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 306 ++++- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- 50 files changed, 10431 insertions(+), 328 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 8da1b149d0..cbc5f5570e 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 3, - "minor": 5, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -326,6 +331,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 13, @@ -334,6 +348,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -342,6 +364,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -350,6 +377,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -434,6 +466,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1010,6 +1047,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1112,6 +1157,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1258,6 +1311,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1320,6 +1381,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -1328,6 +1397,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -1336,6 +1413,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -1344,6 +1429,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -1352,6 +1445,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -1398,6 +1499,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -1440,6 +1549,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -1514,6 +1631,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -1568,6 +1693,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -1610,6 +1743,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -1640,6 +1781,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -1694,6 +1843,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -1720,12 +1877,28 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ ], "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -1736,6 +1909,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -1786,6 +1967,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -1800,6 +1989,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -1834,6 +2031,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -1864,6 +2069,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -1934,6 +2147,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-32" +} + { "id": "libvirt-32", "error": { @@ -1942,6 +2163,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -1980,6 +2209,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-34" +} + { "id": "libvirt-34", "error": { @@ -1988,12 +2225,28 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-35" +} + { "return": [ ], "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -2044,6 +2297,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -2117,6 +2375,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -2195,18 +2458,33 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -2908,6 +3186,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -2918,12 +3201,22 @@ "id": "libvirt-42" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-43" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-44" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 3e700cb427..ab23f03618 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -109,7 +109,7 @@ <flag name='hda-output'/> <version>1005003</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>46523</microcodeVersion> + <microcodeVersion>50616</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 d53fb576d2..c42f04ac14 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 6, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -332,6 +337,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 13, @@ -340,6 +354,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -348,6 +370,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -356,6 +383,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -443,6 +475,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1031,6 +1068,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1133,6 +1178,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1287,6 +1340,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1349,6 +1410,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -1357,6 +1426,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -1365,6 +1442,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -1373,6 +1458,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -1381,6 +1474,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -1427,6 +1528,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -1469,6 +1578,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -1543,6 +1660,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -1597,6 +1722,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -1639,6 +1772,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -1673,6 +1814,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -1731,6 +1880,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -1757,6 +1914,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -1767,6 +1932,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -1781,6 +1954,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -1831,6 +2012,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -1845,6 +2034,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -1879,6 +2076,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -1909,6 +2114,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -1979,6 +2192,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-32" +} + { "id": "libvirt-32", "error": { @@ -1987,6 +2208,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2025,6 +2254,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-34" +} + { "id": "libvirt-34", "error": { @@ -2033,12 +2270,28 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-35" +} + { "return": [ ], "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -2089,6 +2342,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -2170,6 +2428,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -2248,18 +2511,33 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -2863,6 +3141,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -2885,12 +3168,22 @@ "id": "libvirt-42" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-43" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-44" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 14eca7e7cb..4f6d2bb70f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -114,7 +114,7 @@ <flag name='hda-output'/> <version>1006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>44752</microcodeVersion> + <microcodeVersion>48845</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 4fcc7aa25a..62e0518a1a 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 7, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -341,6 +346,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 13, @@ -349,6 +363,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -357,6 +379,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -365,6 +392,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -455,6 +487,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1040,6 +1077,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1142,6 +1187,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1296,6 +1349,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1358,6 +1419,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -1366,6 +1435,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -1374,6 +1451,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -1382,6 +1467,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -1390,6 +1483,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -1436,6 +1537,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -1478,6 +1587,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -1552,6 +1669,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -1606,6 +1731,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -1648,6 +1781,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -1682,6 +1823,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -1740,6 +1889,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -1766,6 +1923,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -1780,6 +1945,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -1798,6 +1971,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -1848,6 +2029,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -1862,6 +2051,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -1896,6 +2093,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -1926,6 +2131,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -1996,6 +2209,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-32" +} + { "id": "libvirt-32", "error": { @@ -2004,6 +2225,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2042,6 +2271,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-34" +} + { "id": "libvirt-34", "error": { @@ -2050,12 +2287,28 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-35" +} + { "return": [ ], "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -2106,6 +2359,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -2195,6 +2453,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -2273,18 +2536,33 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -3078,6 +3356,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -3100,12 +3383,22 @@ "id": "libvirt-42" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-43" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-44" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 43b5374fd2..9b2e6d720c 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -116,7 +116,7 @@ <flag name='hda-output'/> <version>1007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>50196</microcodeVersion> + <microcodeVersion>54289</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 543bce9def..f0f853b7fe 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 1, - "minor": 1, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -374,6 +379,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 13, @@ -382,6 +396,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -390,6 +412,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -398,6 +425,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -500,6 +532,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1283,6 +1320,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1393,6 +1438,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1555,6 +1608,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1625,6 +1686,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -1633,6 +1702,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -1641,6 +1718,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -1649,6 +1734,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -1657,6 +1750,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -1703,6 +1804,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -1745,6 +1854,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -1831,6 +1948,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -1885,6 +2010,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -1935,6 +2068,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -1973,6 +2114,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2035,6 +2184,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2061,6 +2218,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -2099,6 +2264,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -2149,6 +2322,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -2203,6 +2384,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2217,6 +2406,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2251,6 +2448,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -2281,6 +2486,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2351,6 +2564,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -2405,6 +2626,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2455,6 +2684,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-34" +} + { "id": "libvirt-34", "error": { @@ -2463,12 +2700,28 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-35" +} + { "return": [ ], "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -2523,6 +2776,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -2628,6 +2886,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -2709,6 +2972,11 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ "tpm-tis" @@ -2716,6 +2984,11 @@ "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ "passthrough" @@ -2723,6 +2996,11 @@ "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -3583,6 +3861,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -3605,12 +3888,22 @@ "id": "libvirt-42" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-43" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-44" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index ac52c68d96..3d352b0a8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -132,7 +132,7 @@ <flag name='hda-output'/> <version>2001001</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>58992</microcodeVersion> + <microcodeVersion>63085</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 11171d5b3f..02ee2fc0b5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 10, - "major": 2 - }, - "package": " (v2.10.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "aarch64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -485,6 +490,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 17, @@ -493,6 +507,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -501,6 +523,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -509,6 +536,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -626,6 +658,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -3196,6 +3233,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -3424,6 +3469,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -3711,6 +3764,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -3872,6 +3933,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -3880,6 +3949,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -3888,6 +3965,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -3896,6 +3981,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -3904,6 +3997,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -3912,6 +4013,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -4019,6 +4128,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -4133,6 +4250,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -4209,6 +4334,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -4217,6 +4350,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -4286,6 +4427,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -4313,6 +4462,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -4321,6 +4478,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -4329,6 +4494,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -4402,6 +4575,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -4410,6 +4591,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4467,6 +4656,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -4618,6 +4815,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -4665,6 +4870,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -4673,6 +4886,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -4816,6 +5037,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -4824,6 +5053,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -4868,6 +5105,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -4948,6 +5193,11 @@ "id": "libvirt-35" } +{ + "execute": "query-machines", + "id": "libvirt-36" +} + { "return": [ { @@ -5215,6 +5465,11 @@ "id": "libvirt-36" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-37" +} + { "return": [ { @@ -5381,18 +5636,33 @@ "id": "libvirt-37" } +{ + "execute": "query-tpm-models", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-tpm-types", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-command-line-options", + "id": "libvirt-40" +} + { "return": [ { @@ -6538,6 +6808,11 @@ "id": "libvirt-40" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-41" +} + { "return": [ { @@ -6588,6 +6863,11 @@ "id": "libvirt-41" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-42" +} + { "return": [ { @@ -16311,6 +16591,11 @@ "id": "libvirt-42" } +{ + "execute": "query-gic-capabilities", + "id": "libvirt-43" +} + { "return": [ { @@ -16327,12 +16612,22 @@ "id": "libvirt-43" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 6e259ed6a7..46d9d84e98 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='vhost-vsock'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>303541</microcodeVersion> + <microcodeVersion>307649</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 980f8ecc11..aa888fe00d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 10, - "major": 2 - }, - "package": " (v2.10.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "ppc64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -482,6 +487,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 16, @@ -490,6 +504,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -498,6 +520,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -506,6 +533,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -623,6 +655,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -3297,6 +3334,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -3525,6 +3570,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -3812,6 +3865,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -3973,6 +4034,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -3981,6 +4050,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -3989,6 +4066,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -3997,6 +4082,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -4005,6 +4098,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -4013,6 +4114,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -4120,6 +4229,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -4234,6 +4351,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -4310,6 +4435,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -4318,6 +4451,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -4387,6 +4528,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -4414,6 +4563,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -4422,6 +4579,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -4430,6 +4595,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -4503,6 +4676,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -4511,6 +4692,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4568,6 +4757,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -4719,6 +4916,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -4766,6 +4971,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -4774,6 +4987,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -4917,6 +5138,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -4925,6 +5154,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -4969,6 +5206,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -5049,6 +5294,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "spapr-pci-host-bridge" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -5135,6 +5388,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -5253,6 +5511,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -7429,18 +7692,33 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -8581,6 +8859,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -8631,6 +8914,11 @@ "id": "libvirt-42" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-43" +} + { "return": [ { @@ -18354,12 +18642,22 @@ "id": "libvirt-43" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 0fa972ce92..b9bf8afb8e 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='vhost-vsock'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>382824</microcodeVersion> + <microcodeVersion>386994</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 3e19ac67da..83cb984fcb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 10, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "s390x" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -494,6 +499,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -502,6 +516,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -510,6 +532,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -518,6 +545,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -635,6 +667,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1537,6 +1574,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1765,6 +1810,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2052,6 +2105,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2213,6 +2274,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-13" +} + { "return": [ { @@ -2351,6 +2420,14 @@ "id": "libvirt-13" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-14" +} + { "return": [ { @@ -2552,6 +2629,14 @@ "id": "libvirt-14" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-15" +} + { "return": [ { @@ -2627,6 +2712,14 @@ "id": "libvirt-15" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2635,6 +2728,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2643,6 +2744,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-18" +} + { "id": "libvirt-18", "error": { @@ -2651,6 +2760,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2758,6 +2875,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2872,6 +2997,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -2880,6 +3013,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -2888,6 +3029,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "id": "libvirt-23", "error": { @@ -2896,6 +3045,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2923,6 +3080,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -2931,6 +3096,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "id": "libvirt-26", "error": { @@ -2939,6 +3112,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -2947,6 +3128,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3098,6 +3287,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3145,6 +3342,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-30" +} + { "id": "libvirt-30", "error": { @@ -3153,6 +3358,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3296,6 +3509,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3358,6 +3579,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3402,6 +3631,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtual-css-bridge" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3412,6 +3649,11 @@ "id": "libvirt-34" } +{ + "execute": "query-machines", + "id": "libvirt-35" +} + { "return": [ { @@ -3460,6 +3702,11 @@ "id": "libvirt-35" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-36" +} + { "return": [ { @@ -3994,18 +4241,33 @@ "id": "libvirt-36" } +{ + "execute": "query-tpm-models", + "id": "libvirt-37" +} + { "return": [ ], "id": "libvirt-37" } +{ + "execute": "query-tpm-types", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-command-line-options", + "id": "libvirt-39" +} + { "return": [ { @@ -5111,6 +5373,11 @@ "id": "libvirt-39" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-40" +} + { "return": [ { @@ -5161,6 +5428,11 @@ "id": "libvirt-40" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-41" +} + { "return": [ { @@ -14884,6 +15156,17 @@ "id": "libvirt-41" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-42" +} + { "return": { "model": { @@ -14924,6 +15207,20 @@ "id": "libvirt-42" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-43" +} + { "id": "libvirt-43", "error": { @@ -14932,12 +15229,22 @@ } } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { @@ -16386,6 +16693,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-46" +} + { "id": "libvirt-3", "error": { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 23f653d598..e75b41eba5 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='vhost-vsock'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>303434</microcodeVersion> + <microcodeVersion>307902</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 6c6ecc2687..a83654d921 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 10, - "major": 2 - }, - "package": " (v2.10.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -491,6 +496,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -499,6 +513,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -507,6 +529,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -515,6 +542,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -632,6 +664,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -2174,6 +2211,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -2402,6 +2447,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2689,6 +2742,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2850,6 +2911,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2858,6 +2927,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2866,6 +2943,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2874,6 +2959,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2882,6 +2975,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -2944,6 +3045,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -3051,6 +3160,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -3165,6 +3282,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -3241,6 +3366,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -3304,6 +3437,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -3353,6 +3494,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -3422,6 +3571,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -3449,6 +3606,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -3487,6 +3652,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -3565,6 +3738,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -3638,6 +3819,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3652,6 +3841,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3709,6 +3906,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3752,6 +3957,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3847,6 +4060,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -4008,6 +4229,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -4065,6 +4294,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -4161,6 +4398,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -4304,6 +4549,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -4312,6 +4565,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -4356,6 +4617,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -4436,6 +4705,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -4471,6 +4748,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -4660,6 +4942,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -4995,6 +5282,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -5002,6 +5294,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -5009,6 +5306,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -6288,6 +6590,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -6338,6 +6645,11 @@ "id": "libvirt-45" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-46" +} + { "return": [ { @@ -16061,6 +16373,17 @@ "id": "libvirt-46" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-47" +} + { "return": { "model": { @@ -16240,6 +16563,187 @@ "id": "libvirt-47" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": false, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": false, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": false, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 60, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": false, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-48" +} + { "return": { "model": { @@ -16483,6 +16987,20 @@ "id": "libvirt-48" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-49" +} + { "return": { "model": { @@ -16662,6 +17180,187 @@ "id": "libvirt-49" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": false, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": false, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": false, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 60, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": false, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-50" +} + { "return": { "model": { @@ -16905,12 +17604,22 @@ "id": "libvirt-50" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-51" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-52" +} + { "return": [ { @@ -17283,6 +17992,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-53" +} + { "return": { "model": { @@ -17462,6 +18182,187 @@ "id": "libvirt-3" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": false, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": true, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "AuthenticAMD", + "pku": true, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": true, + "npt": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": false, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": false, + "tm": false, + "kvmclock-stable-bit": false, + "hypervisor": true, + "pcommit": true, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": false, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 6, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": false, + "fma": false, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": true, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": false, + "kvm-steal-time": false, + "kvmclock": false, + "lwp": false, + "xop": false, + "avx": false, + "ospke": true, + "acpi": true, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": false, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483658, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": false, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": true, + "avx512er": false, + "pmm-en": false, + "pcid": false, + "3dnow": true, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": false, + "rdseed": false, + "avx512-4vnniw": false, + "vme": false, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "QEMU TCG CPU version 2.5+", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-54" +} + { "return": { "model": { @@ -17705,6 +18606,20 @@ "id": "libvirt-4" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-55" +} + { "return": { "model": { @@ -17884,6 +18799,187 @@ "id": "libvirt-5" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": false, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": true, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "AuthenticAMD", + "pku": true, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": true, + "npt": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": false, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": false, + "tm": false, + "kvmclock-stable-bit": false, + "hypervisor": true, + "pcommit": true, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": false, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 6, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": false, + "fma": false, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": true, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": false, + "kvm-steal-time": false, + "kvmclock": false, + "lwp": false, + "xop": false, + "avx": false, + "ospke": true, + "acpi": true, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": false, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483658, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": false, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": true, + "avx512er": false, + "pmm-en": false, + "pcid": false, + "3dnow": true, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": false, + "rdseed": false, + "avx512-4vnniw": false, + "vme": false, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "QEMU TCG CPU version 2.5+", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-56" +} + { "return": { "model": { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 7c5aa50d59..4e214768bc 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -204,7 +204,7 @@ <flag name='vhost-vsock'/> <version>2010000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>344938</microcodeVersion> + <microcodeVersion>367526</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 21fede318b..22b8b66dd9 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 11, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "s390x" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -503,6 +508,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -511,6 +525,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -519,6 +541,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -527,6 +554,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -644,6 +676,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1578,6 +1615,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1806,6 +1851,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2093,6 +2146,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2258,6 +2319,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-13" +} + { "return": [ { @@ -2396,6 +2465,14 @@ "id": "libvirt-13" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-14" +} + { "return": [ { @@ -2597,6 +2674,14 @@ "id": "libvirt-14" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-15" +} + { "return": [ { @@ -2676,6 +2761,14 @@ "id": "libvirt-15" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2684,6 +2777,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2692,6 +2793,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-18" +} + { "id": "libvirt-18", "error": { @@ -2700,6 +2809,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2812,6 +2929,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2926,6 +3051,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -2934,6 +3067,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -2942,6 +3083,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "id": "libvirt-23", "error": { @@ -2950,6 +3099,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2977,6 +3134,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -2985,6 +3150,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "id": "libvirt-26", "error": { @@ -2993,6 +3166,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -3001,6 +3182,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3152,6 +3341,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3199,6 +3396,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-30" +} + { "id": "libvirt-30", "error": { @@ -3207,6 +3412,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3350,6 +3563,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3412,6 +3633,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3456,6 +3685,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-ccw" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3521,6 +3758,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtual-css-bridge" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3531,6 +3776,11 @@ "id": "libvirt-35" } +{ + "execute": "query-machines", + "id": "libvirt-36" +} + { "return": [ { @@ -3584,6 +3834,11 @@ "id": "libvirt-36" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-37" +} + { "return": [ { @@ -4118,12 +4373,22 @@ "id": "libvirt-37" } +{ + "execute": "query-tpm-models", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-tpm-types", + "id": "libvirt-39" +} + { "return": [ "emulator" @@ -4131,6 +4396,11 @@ "id": "libvirt-39" } +{ + "execute": "query-command-line-options", + "id": "libvirt-40" +} + { "return": [ { @@ -5252,6 +5522,11 @@ "id": "libvirt-40" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-41" +} + { "return": [ { @@ -5310,6 +5585,11 @@ "id": "libvirt-41" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-42" +} + { "return": [ { @@ -15178,6 +15458,17 @@ "id": "libvirt-42" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-43" +} + { "return": { "model": { @@ -15217,6 +15508,20 @@ "id": "libvirt-43" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-44" +} + { "id": "libvirt-44", "error": { @@ -15225,12 +15530,22 @@ } } +{ + "execute": "qmp_capabilities", + "id": "libvirt-45" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-46" +} + { "return": [ { @@ -18018,6 +18333,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-47" +} + { "id": "libvirt-3", "error": { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 7106147417..5ffe5655dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -127,7 +127,7 @@ <flag name='vhost-vsock'/> <version>2011000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>342166</microcodeVersion> + <microcodeVersion>346754</microcodeVersion> <package></package> <arch>s390x</arch> <hostCPU type='kvm' model='z14-base' migratability='no'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 3ca0ea13fa..1a4a6a4cf5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -1,17 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 90, - "minor": 11, - "major": 2 - }, - "package": "v2.12.0-rc0" - }, - "capabilities": [ - "oob" - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -20,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -32,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "aarch64" @@ -39,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -519,6 +523,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 20, @@ -527,6 +540,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -535,6 +556,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -543,6 +569,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -666,6 +697,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -3484,6 +3520,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -3716,6 +3760,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -4011,6 +4063,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -4176,6 +4236,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -4184,6 +4252,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -4192,6 +4268,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -4200,6 +4284,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -4208,6 +4300,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -4216,6 +4316,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -4342,6 +4450,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -4456,6 +4572,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -4532,6 +4656,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -4540,6 +4672,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -4609,6 +4749,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -4640,6 +4788,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -4648,6 +4804,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -4656,6 +4820,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -4729,6 +4901,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -4737,6 +4917,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4794,6 +4982,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -4945,6 +5141,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -4992,6 +5196,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -5000,6 +5212,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -5143,6 +5363,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -5151,6 +5379,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -5195,6 +5431,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -5275,6 +5519,14 @@ "id": "libvirt-35" } +{ + "execute": "qom-list-properties", + "arguments": { + "typename": "memory-backend-file" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -5329,6 +5581,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -5626,6 +5883,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -5802,12 +6064,22 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ "emulator" @@ -5815,6 +6087,11 @@ "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -6976,6 +7253,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -7038,6 +7320,11 @@ "id": "libvirt-42" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-43" +} + { "return": [ { @@ -18406,6 +18693,11 @@ "id": "libvirt-43" } +{ + "execute": "query-gic-capabilities", + "id": "libvirt-44" +} + { "return": [ { @@ -18422,12 +18714,22 @@ "id": "libvirt-44" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-45" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-46" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f511bcb58c..3dfdb076d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -169,7 +169,7 @@ <flag name='vhost-vsock'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>343099</microcodeVersion> + <microcodeVersion>347315</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 1e93cd6dca..f361bb007c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -1,17 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 90, - "minor": 11, - "major": 2 - }, - "package": "v2.12.0-rc0" - }, - "capabilities": [ - "oob" - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -20,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -32,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "ppc64" @@ -39,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -516,6 +520,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 19, @@ -524,6 +537,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -532,6 +553,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -540,6 +566,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -663,6 +694,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -3473,6 +3509,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -3705,6 +3749,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -4000,6 +4052,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -4165,6 +4225,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -4173,6 +4241,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -4181,6 +4257,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -4189,6 +4273,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -4197,6 +4289,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -4205,6 +4305,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -4331,6 +4439,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -4445,6 +4561,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -4521,6 +4645,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -4529,6 +4661,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -4598,6 +4738,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -4629,6 +4777,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -4637,6 +4793,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -4645,6 +4809,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -4718,6 +4890,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -4726,6 +4906,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4783,6 +4971,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -4934,6 +5130,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -4981,6 +5185,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -4989,6 +5201,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -5132,6 +5352,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -5140,6 +5368,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -5184,6 +5420,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -5264,6 +5508,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "spapr-pci-host-bridge" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -5322,6 +5574,14 @@ "id": "libvirt-36" } +{ + "execute": "qom-list-properties", + "arguments": { + "typename": "memory-backend-file" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -5376,6 +5636,11 @@ "id": "libvirt-37" } +{ + "execute": "query-machines", + "id": "libvirt-38" +} + { "return": [ { @@ -5514,6 +5779,11 @@ "id": "libvirt-38" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-39" +} + { "return": [ { @@ -7710,12 +7980,22 @@ "id": "libvirt-39" } +{ + "execute": "query-tpm-models", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-tpm-types", + "id": "libvirt-41" +} + { "return": [ "emulator" @@ -7723,6 +8003,11 @@ "id": "libvirt-41" } +{ + "execute": "query-command-line-options", + "id": "libvirt-42" +} + { "return": [ { @@ -8879,6 +9164,11 @@ "id": "libvirt-42" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-43" +} + { "return": [ { @@ -8941,6 +9231,11 @@ "id": "libvirt-43" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-44" +} + { "return": [ { @@ -20309,12 +20604,22 @@ "id": "libvirt-44" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-45" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-46" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 37813ad0b1..e217ea7981 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -166,7 +166,7 @@ <flag name='vhost-vsock'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>419968</microcodeVersion> + <microcodeVersion>424246</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 29c3403550..fe51cce7fe 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 12, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "s390x" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -527,6 +532,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 18, @@ -535,6 +549,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -543,6 +565,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -551,6 +578,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -674,6 +706,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1624,6 +1661,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1856,6 +1901,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2151,6 +2204,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2316,6 +2377,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-13" +} + { "return": [ { @@ -2458,6 +2527,14 @@ "id": "libvirt-13" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-14" +} + { "return": [ { @@ -2667,6 +2744,14 @@ "id": "libvirt-14" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-15" +} + { "return": [ { @@ -2746,6 +2831,14 @@ "id": "libvirt-15" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2754,6 +2847,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2762,6 +2863,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-18" +} + { "id": "libvirt-18", "error": { @@ -2770,6 +2879,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2896,6 +3013,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -3014,6 +3139,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -3022,6 +3155,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -3030,6 +3171,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "id": "libvirt-23", "error": { @@ -3038,6 +3187,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -3069,6 +3226,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -3077,6 +3242,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "id": "libvirt-26", "error": { @@ -3085,6 +3258,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -3093,6 +3274,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3244,6 +3433,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3291,6 +3488,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-30" +} + { "id": "libvirt-30", "error": { @@ -3299,6 +3504,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3442,6 +3655,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3504,6 +3725,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3548,6 +3777,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-ccw" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3613,6 +3850,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtual-css-bridge" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3628,6 +3873,14 @@ "id": "libvirt-35" } +{ + "execute": "qom-list-properties", + "arguments": { + "typename": "memory-backend-file" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -3682,6 +3935,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -3740,6 +3998,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -4275,12 +4538,22 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ "emulator" @@ -4288,6 +4561,11 @@ "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -5413,6 +5691,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -5475,6 +5758,11 @@ "id": "libvirt-42" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-43" +} + { "return": [ { @@ -16843,6 +17131,17 @@ "id": "libvirt-43" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-44" +} + { "return": { "model": { @@ -16881,6 +17180,20 @@ "id": "libvirt-44" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-45" +} + { "id": "libvirt-45", "error": { @@ -16889,12 +17202,22 @@ } } +{ + "execute": "qmp_capabilities", + "id": "libvirt-46" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-47" +} + { "return": [ { @@ -19544,6 +19867,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-48" +} + { "id": "libvirt-3", "error": { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 3191e9ba95..865b0d87cb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -133,7 +133,7 @@ <flag name='vhost-vsock'/> <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>371055</microcodeVersion> + <microcodeVersion>375765</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 c40046beef..29cb9d85e0 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -1,17 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 90, - "minor": 11, - "major": 2 - }, - "package": "v2.12.0-rc0" - }, - "capabilities": [ - "oob" - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -20,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -32,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -39,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -534,6 +538,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 19, @@ -542,6 +555,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -550,6 +571,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -558,6 +584,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -681,6 +712,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -2331,6 +2367,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -2563,6 +2607,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2858,6 +2910,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -3023,6 +3083,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -3031,6 +3099,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -3039,6 +3115,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -3047,6 +3131,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -3055,6 +3147,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -3063,6 +3163,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -3189,6 +3297,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -3303,6 +3419,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -3379,6 +3503,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -3442,6 +3574,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -3491,6 +3631,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -3560,6 +3708,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -3591,6 +3747,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -3633,6 +3797,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -3715,6 +3887,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -3788,6 +3968,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3802,6 +3990,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3859,6 +4055,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3902,6 +4106,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3997,6 +4209,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -4148,6 +4368,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -4195,6 +4423,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -4291,6 +4527,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -4434,6 +4678,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -4442,6 +4694,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -4486,6 +4746,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -4566,6 +4834,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -4605,6 +4881,14 @@ "id": "libvirt-39" } +{ + "execute": "qom-list-properties", + "arguments": { + "typename": "memory-backend-file" + }, + "id": "libvirt-40" +} + { "return": [ { @@ -4659,6 +4943,11 @@ "id": "libvirt-40" } +{ + "execute": "query-machines", + "id": "libvirt-41" +} + { "return": [ { @@ -4858,6 +5147,11 @@ "id": "libvirt-41" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-42" +} + { "return": [ { @@ -5372,6 +5666,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-models", + "id": "libvirt-43" +} + { "return": [ "tpm-crb", @@ -5380,6 +5679,11 @@ "id": "libvirt-43" } +{ + "execute": "query-tpm-types", + "id": "libvirt-44" +} + { "return": [ "passthrough", @@ -5388,6 +5692,11 @@ "id": "libvirt-44" } +{ + "execute": "query-command-line-options", + "id": "libvirt-45" +} + { "return": [ { @@ -6675,6 +6984,11 @@ "id": "libvirt-45" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-46" +} + { "return": [ { @@ -6737,6 +7051,11 @@ "id": "libvirt-46" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-47" +} + { "return": [ { @@ -18105,6 +18424,17 @@ "id": "libvirt-47" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-48" +} + { "return": { "model": { @@ -18295,6 +18625,198 @@ "id": "libvirt-48" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "gfni": false, + "pause-filter": false, + "xsavec": false, + "intel-pt": false, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": false, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "avx512vbmi2": false, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": false, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": false, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "model": 63, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 2, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "spec-ctrl": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "ibpb": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "vaes": false, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "vpclmulqdq": false, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": true, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": false, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "kvm-pv-tlb-flush": false, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-49" +} + { "return": { "model": { @@ -18550,6 +19072,20 @@ "id": "libvirt-49" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-50" +} + { "return": { "model": { @@ -18740,6 +19276,198 @@ "id": "libvirt-50" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "gfni": false, + "pause-filter": false, + "xsavec": false, + "intel-pt": false, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": false, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "avx512vbmi2": false, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": false, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": false, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "model": 63, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 2, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "spec-ctrl": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "ibpb": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "vaes": false, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "vpclmulqdq": false, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": true, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": false, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "kvm-pv-tlb-flush": false, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-51" +} + { "return": { "model": { @@ -18995,12 +19723,22 @@ "id": "libvirt-51" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-52" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-53" +} + { "return": [ { @@ -19589,6 +20327,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-54" +} + { "return": { "model": { @@ -19779,6 +20528,198 @@ "id": "libvirt-3" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "gfni": false, + "pause-filter": false, + "xsavec": false, + "intel-pt": false, + "osxsave": false, + "kvm-asyncpf": false, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "avx512vbmi2": false, + "cr8legacy": true, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "AuthenticAMD", + "pku": true, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": true, + "npt": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": false, + "avx512vbmi": false, + "avx512vnni": false, + "flushbyasid": false, + "f16c": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": false, + "tm": false, + "kvmclock-stable-bit": false, + "hypervisor": true, + "pcommit": true, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": false, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "model": 6, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": false, + "fma": false, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": true, + "osvw": false, + "apic": true, + "pmm": false, + "spec-ctrl": false, + "tsc-adjust": false, + "kvm-steal-time": false, + "kvmclock": false, + "lwp": false, + "xop": false, + "ibpb": false, + "avx": false, + "ospke": true, + "acpi": true, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": false, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483658, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": false, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": true, + "avx512er": false, + "pmm-en": false, + "pcid": false, + "3dnow": true, + "erms": true, + "lahf-lm": true, + "vpclmulqdq": false, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": false, + "rdseed": false, + "avx512-4vnniw": false, + "vme": false, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "kvm-pv-tlb-flush": false, + "tbm": false, + "wdt": false, + "model-id": "QEMU TCG CPU version 2.5+", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-55" +} + { "return": { "model": { @@ -20034,6 +20975,20 @@ "id": "libvirt-4" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-56" +} + { "return": { "model": { @@ -20224,6 +21179,198 @@ "id": "libvirt-5" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "gfni": false, + "pause-filter": false, + "xsavec": false, + "intel-pt": false, + "osxsave": false, + "kvm-asyncpf": false, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "avx512vbmi2": false, + "cr8legacy": true, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "AuthenticAMD", + "pku": true, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": true, + "npt": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": false, + "avx512vbmi": false, + "avx512vnni": false, + "flushbyasid": false, + "f16c": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": false, + "tm": false, + "kvmclock-stable-bit": false, + "hypervisor": true, + "pcommit": true, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": false, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "model": 6, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": false, + "fma": false, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": true, + "osvw": false, + "apic": true, + "pmm": false, + "spec-ctrl": false, + "tsc-adjust": false, + "kvm-steal-time": false, + "kvmclock": false, + "lwp": false, + "xop": false, + "ibpb": false, + "avx": false, + "ospke": true, + "acpi": true, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": false, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483658, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": false, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": true, + "avx512er": false, + "pmm-en": false, + "pcid": false, + "3dnow": true, + "erms": true, + "lahf-lm": true, + "vpclmulqdq": false, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": false, + "rdseed": false, + "avx512-4vnniw": false, + "vme": false, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "kvm-pv-tlb-flush": false, + "tbm": false, + "wdt": false, + "model-id": "QEMU TCG CPU version 2.5+", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-57" +} + { "return": { "model": { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 964b9e8fa6..32fd6beb83 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -208,7 +208,7 @@ <flag name='vhost-vsock'/> <version>2011090</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>390813</microcodeVersion> + <microcodeVersion>414769</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 68ecb0c17d..e4fcfb410d 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 4, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -422,6 +427,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 13, @@ -430,6 +444,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -438,6 +460,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -446,6 +473,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -557,6 +589,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1445,6 +1482,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1597,6 +1642,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1810,6 +1863,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1913,6 +1974,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -1921,6 +1990,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -1929,6 +2006,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -1937,6 +2022,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -1945,6 +2038,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -1997,6 +2098,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2053,6 +2162,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2148,6 +2265,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2205,6 +2330,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -2258,6 +2391,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -2299,6 +2440,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2364,6 +2513,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2391,6 +2548,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -2429,6 +2594,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -2483,6 +2656,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -2543,6 +2724,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2557,6 +2746,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2604,6 +2801,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -2637,6 +2842,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2714,6 +2927,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -2795,6 +3016,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2825,6 +3054,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -2902,6 +3139,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -2987,6 +3232,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -2995,6 +3248,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -3034,6 +3295,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -3104,6 +3373,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -3114,6 +3391,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -3243,6 +3525,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -3333,6 +3620,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -3340,6 +3632,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -3347,6 +3644,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -4355,6 +4657,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -4385,12 +4692,22 @@ "id": "libvirt-45" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-46" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-47" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index ffbb3da124..7a890ebec9 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -158,7 +158,7 @@ <flag name='hda-output'/> <version>2004000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>75406</microcodeVersion> + <microcodeVersion>79859</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 5bc505abb3..0295b7a88a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 5, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -449,6 +454,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 16, @@ -457,6 +471,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -465,6 +487,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -473,6 +500,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -584,6 +616,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1490,6 +1527,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1652,6 +1697,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1880,6 +1933,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1998,6 +2059,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2006,6 +2075,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2014,6 +2091,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2022,6 +2107,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2030,6 +2123,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -2082,6 +2183,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2166,6 +2275,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2261,6 +2378,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2318,6 +2443,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -2371,6 +2504,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -2412,6 +2553,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2477,6 +2626,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2504,6 +2661,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -2542,6 +2707,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -2596,6 +2769,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -2656,6 +2837,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2670,6 +2859,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2717,6 +2914,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -2750,6 +2955,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2827,6 +3040,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -2933,6 +3154,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2973,6 +3202,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3050,6 +3287,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3150,6 +3395,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -3158,6 +3411,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -3197,6 +3458,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -3267,6 +3536,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -3277,6 +3554,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -3414,6 +3696,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -3504,6 +3791,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -3511,6 +3803,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -3518,6 +3815,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -4563,6 +4865,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -4597,6 +4904,11 @@ "id": "libvirt-45" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-46" +} + { "return": [ { @@ -12142,12 +12454,22 @@ "id": "libvirt-46" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-47" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-48" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 98aad7cb17..c90e5a883e 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='hda-output'/> <version>2005000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>216528</microcodeVersion> + <microcodeVersion>221040</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 0ec7193b09..ae1d0c92ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 6, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "aarch64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -452,6 +457,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 17, @@ -460,6 +474,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -468,6 +490,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -476,6 +503,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -593,6 +625,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -2249,6 +2286,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -2411,6 +2456,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2639,6 +2692,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2757,6 +2818,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2765,6 +2834,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2773,6 +2850,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2781,6 +2866,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2789,6 +2882,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2797,6 +2898,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2885,6 +2994,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2980,6 +3097,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -3037,6 +3162,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -3045,6 +3178,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -3110,6 +3251,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -3137,6 +3286,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -3145,6 +3302,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -3153,6 +3318,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -3213,6 +3386,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -3221,6 +3402,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3268,6 +3457,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3364,6 +3561,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3394,6 +3599,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -3402,6 +3615,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3502,6 +3723,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -3510,6 +3739,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3549,6 +3786,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3619,6 +3864,11 @@ "id": "libvirt-35" } +{ + "execute": "query-machines", + "id": "libvirt-36" +} + { "return": [ { @@ -3794,6 +4044,11 @@ "id": "libvirt-36" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-37" +} + { "return": [ { @@ -3893,18 +4148,33 @@ "id": "libvirt-37" } +{ + "execute": "query-tpm-models", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-tpm-types", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-command-line-options", + "id": "libvirt-40" +} + { "return": [ { @@ -4877,6 +5147,11 @@ "id": "libvirt-40" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-41" +} + { "return": [ { @@ -4911,6 +5186,11 @@ "id": "libvirt-41" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-42" +} + { "return": [ { @@ -12916,6 +13196,11 @@ "id": "libvirt-42" } +{ + "execute": "query-gic-capabilities", + "id": "libvirt-43" +} + { "return": [ { @@ -12932,12 +13217,22 @@ "id": "libvirt-43" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 554a48a167..10d3fe5d30 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -146,7 +146,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>228241</microcodeVersion> + <microcodeVersion>232360</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 d4a893bb4d..f50c2a5895 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 6, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "ppc64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -449,6 +454,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -457,6 +471,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -465,6 +487,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -473,6 +500,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -590,6 +622,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -2399,6 +2436,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -2561,6 +2606,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2789,6 +2842,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2907,6 +2968,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2915,6 +2984,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2923,6 +3000,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2931,6 +3016,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2939,6 +3032,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2947,6 +3048,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -3035,6 +3144,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -3130,6 +3247,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -3187,6 +3312,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -3195,6 +3328,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -3260,6 +3401,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -3287,6 +3436,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -3295,6 +3452,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -3303,6 +3468,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -3363,6 +3536,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -3371,6 +3552,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3418,6 +3607,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3514,6 +3711,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3544,6 +3749,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -3552,6 +3765,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3652,6 +3873,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -3660,6 +3889,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3699,6 +3936,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3769,6 +4014,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "spapr-pci-host-bridge" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -3815,6 +4068,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -3887,6 +4145,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -5189,18 +5452,33 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -6168,6 +6446,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -6202,6 +6485,11 @@ "id": "libvirt-42" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-43" +} + { "return": [ { @@ -14207,12 +14495,22 @@ "id": "libvirt-43" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index d05fc0a665..df23297370 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -141,7 +141,7 @@ <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>263005</microcodeVersion> + <microcodeVersion>267186</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 73a22ed0bb..a0554959f0 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 6, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -455,6 +460,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -463,6 +477,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -471,6 +493,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -479,6 +506,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -596,6 +628,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1568,6 +1605,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1730,6 +1775,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1958,6 +2011,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2076,6 +2137,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2084,6 +2153,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2092,6 +2169,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2100,6 +2185,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2108,6 +2201,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -2160,6 +2261,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2248,6 +2357,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2343,6 +2460,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2400,6 +2525,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -2453,6 +2586,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -2494,6 +2635,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2559,6 +2708,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2586,6 +2743,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -2624,6 +2789,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -2678,6 +2851,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -2738,6 +2919,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2752,6 +2941,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2799,6 +2996,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -2832,6 +3037,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2909,6 +3122,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3015,6 +3236,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3055,6 +3284,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3132,6 +3369,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3232,6 +3477,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -3240,6 +3493,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -3279,6 +3540,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -3349,6 +3618,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -3359,6 +3636,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -3472,6 +3754,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -3562,6 +3849,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -3569,6 +3861,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -3576,6 +3873,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -4670,6 +4972,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -4704,6 +5011,11 @@ "id": "libvirt-45" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-46" +} + { "return": [ { @@ -12709,12 +13021,22 @@ "id": "libvirt-46" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-47" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-48" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index de0e8a8a98..f33b805713 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='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>227332</microcodeVersion> + <microcodeVersion>231844</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 fe2aecd2b6..57c84b6a63 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 7, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "s390x" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -461,6 +466,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 16, @@ -469,6 +483,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -477,6 +499,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -485,6 +512,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -602,6 +634,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -980,6 +1017,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1165,6 +1210,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1397,6 +1450,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1519,6 +1580,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-13" +} + { "return": [ { @@ -1648,6 +1717,14 @@ "id": "libvirt-13" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-14" +} + { "return": [ { @@ -1828,6 +1905,14 @@ "id": "libvirt-14" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-15" +} + { "return": [ { @@ -1898,6 +1983,14 @@ "id": "libvirt-15" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -1906,6 +1999,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -1914,6 +2015,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-18" +} + { "id": "libvirt-18", "error": { @@ -1922,6 +2031,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2024,6 +2141,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2134,6 +2259,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -2142,6 +2275,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -2150,6 +2291,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "id": "libvirt-23", "error": { @@ -2158,6 +2307,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2185,6 +2342,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -2193,6 +2358,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "id": "libvirt-26", "error": { @@ -2201,6 +2374,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -2209,6 +2390,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2309,6 +2498,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2339,6 +2536,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-30" +} + { "id": "libvirt-30", "error": { @@ -2347,6 +2552,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2451,6 +2664,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -2508,6 +2729,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2547,6 +2776,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtual-css-bridge" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -2557,6 +2794,11 @@ "id": "libvirt-34" } +{ + "execute": "query-machines", + "id": "libvirt-35" +} + { "return": [ { @@ -2590,6 +2832,11 @@ "id": "libvirt-35" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-36" +} + { "return": [ { @@ -2599,18 +2846,33 @@ "id": "libvirt-36" } +{ + "execute": "query-tpm-models", + "id": "libvirt-37" +} + { "return": [ ], "id": "libvirt-37" } +{ + "execute": "query-tpm-types", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-command-line-options", + "id": "libvirt-39" +} + { "return": [ { @@ -3547,6 +3809,11 @@ "id": "libvirt-39" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-40" +} + { "return": [ { @@ -3581,6 +3848,11 @@ "id": "libvirt-40" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-41" +} + { "return": [ { @@ -11937,12 +12209,22 @@ "id": "libvirt-41" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-42" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-43" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 49b3cb2dfa..2e89151639 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -109,7 +109,7 @@ <flag name='sdl-gl'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>216840</microcodeVersion> + <microcodeVersion>220794</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 eaa84d3381..79b7f3ed96 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 7, - "major": 2 - }, - "package": " (v2.7.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -464,6 +469,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -472,6 +486,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -480,6 +502,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -488,6 +515,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -605,6 +637,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1592,6 +1629,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1777,6 +1822,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2009,6 +2062,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2131,6 +2192,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2139,6 +2208,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2147,6 +2224,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2155,6 +2240,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2163,6 +2256,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -2220,6 +2321,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2322,6 +2431,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2432,6 +2549,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2504,6 +2629,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -2562,6 +2695,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -2611,6 +2752,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2680,6 +2829,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2707,6 +2864,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -2745,6 +2910,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -2823,6 +2996,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -2892,6 +3073,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2906,6 +3095,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2958,6 +3155,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -2996,6 +3201,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3078,6 +3291,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3188,6 +3409,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3228,6 +3457,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3314,6 +3551,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3418,6 +3663,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -3426,6 +3679,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -3465,6 +3726,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -3540,6 +3809,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -3554,6 +3831,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -3703,6 +3985,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -3796,6 +4083,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -3803,6 +4095,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -3810,6 +4107,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -4908,6 +5210,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -4942,6 +5249,11 @@ "id": "libvirt-45" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-46" +} + { "return": [ { @@ -13298,12 +13610,22 @@ "id": "libvirt-46" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-47" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-48" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 939b091fe7..075527b9ec 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='hda-output'/> <version>2007000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>239029</microcodeVersion> + <microcodeVersion>243532</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 34734ec19b..29fb74fcaf 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 93, - "minor": 7, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "s390x" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -473,6 +478,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 16, @@ -481,6 +495,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -489,6 +511,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -497,6 +524,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -614,6 +646,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1220,6 +1257,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1410,6 +1455,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1651,6 +1704,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1778,6 +1839,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-13" +} + { "return": [ { @@ -1907,6 +1976,14 @@ "id": "libvirt-13" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-14" +} + { "return": [ { @@ -2091,6 +2168,14 @@ "id": "libvirt-14" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-15" +} + { "return": [ { @@ -2161,6 +2246,14 @@ "id": "libvirt-15" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2169,6 +2262,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2177,6 +2278,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-18" +} + { "id": "libvirt-18", "error": { @@ -2185,6 +2294,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2287,6 +2404,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2397,6 +2522,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -2405,6 +2538,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -2413,6 +2554,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "id": "libvirt-23", "error": { @@ -2421,6 +2570,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2448,6 +2605,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -2456,6 +2621,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "id": "libvirt-26", "error": { @@ -2464,6 +2637,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -2472,6 +2653,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2577,6 +2766,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2607,6 +2804,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-30" +} + { "id": "libvirt-30", "error": { @@ -2615,6 +2820,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2724,6 +2937,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -2781,6 +3002,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -2820,6 +3049,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtual-css-bridge" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -2830,6 +3067,11 @@ "id": "libvirt-34" } +{ + "execute": "query-machines", + "id": "libvirt-35" +} + { "return": [ { @@ -2868,6 +3110,11 @@ "id": "libvirt-35" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-36" +} + { "return": [ { @@ -3194,18 +3441,33 @@ "id": "libvirt-36" } +{ + "execute": "query-tpm-models", + "id": "libvirt-37" +} + { "return": [ ], "id": "libvirt-37" } +{ + "execute": "query-tpm-types", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-command-line-options", + "id": "libvirt-39" +} + { "return": [ { @@ -4167,6 +4429,11 @@ "id": "libvirt-39" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-40" +} + { "return": [ { @@ -4205,6 +4472,11 @@ "id": "libvirt-40" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-41" +} + { "return": [ { @@ -12975,6 +13247,17 @@ "id": "libvirt-41" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-42" +} + { "return": { "model": { @@ -13001,6 +13284,20 @@ "id": "libvirt-42" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-43" +} + { "id": "libvirt-43", "error": { @@ -13009,12 +13306,22 @@ } } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { @@ -13341,6 +13648,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-46" +} + { "id": "libvirt-3", "error": { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index f3f9c9e54f..b0aef14d97 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -112,7 +112,7 @@ <flag name='vhost-vsock'/> <version>2007093</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>241741</microcodeVersion> + <microcodeVersion>246209</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 30d28c7b5f..297c02b070 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 8, - "major": 2 - }, - "package": " (v2.8.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -467,6 +472,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -475,6 +489,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -483,6 +505,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -491,6 +518,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -608,6 +640,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1676,6 +1713,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1870,6 +1915,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2115,6 +2168,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2246,6 +2307,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2254,6 +2323,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2262,6 +2339,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2270,6 +2355,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2278,6 +2371,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -2335,6 +2436,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2437,6 +2546,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2547,6 +2664,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2619,6 +2744,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -2677,6 +2810,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -2726,6 +2867,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2795,6 +2944,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2822,6 +2979,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -2860,6 +3025,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -2938,6 +3111,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -3007,6 +3188,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3021,6 +3210,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3073,6 +3270,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3111,6 +3316,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3193,6 +3406,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3312,6 +3533,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3352,6 +3581,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3438,6 +3675,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3551,6 +3796,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -3559,6 +3812,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -3598,6 +3859,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -3673,6 +3942,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -3696,6 +3973,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -3865,6 +4147,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -4071,6 +4358,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -4078,6 +4370,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -4085,6 +4382,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -5208,6 +5510,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -5246,6 +5553,11 @@ "id": "libvirt-45" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-46" +} + { "return": [ { @@ -14016,12 +14328,22 @@ "id": "libvirt-46" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-47" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-48" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7a658e2b6a..c230154101 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='vhost-vsock'/> <version>2008000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>255684</microcodeVersion> + <microcodeVersion>260187</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 f367da8d2b..0d9331a4e0 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 9, - "major": 2 - }, - "package": " (v2.9.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "ppc64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -473,6 +478,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 17, @@ -481,6 +495,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -489,6 +511,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -497,6 +524,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -614,6 +646,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -2564,6 +2601,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -2792,6 +2837,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -3071,6 +3124,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -3232,6 +3293,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -3240,6 +3309,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -3248,6 +3325,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -3256,6 +3341,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -3264,6 +3357,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -3272,6 +3373,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -3379,6 +3488,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -3493,6 +3610,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -3569,6 +3694,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -3577,6 +3710,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -3585,6 +3726,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -3612,6 +3761,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-24" +} + { "id": "libvirt-24", "error": { @@ -3620,6 +3777,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -3628,6 +3793,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -3701,6 +3874,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -3709,6 +3890,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3766,6 +3955,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3909,6 +4106,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3948,6 +4153,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-31" +} + { "id": "libvirt-31", "error": { @@ -3956,6 +4169,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -4099,6 +4320,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-33" +} + { "id": "libvirt-33", "error": { @@ -4107,6 +4336,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -4151,6 +4388,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -4231,6 +4476,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "spapr-pci-host-bridge" + }, + "id": "libvirt-36" +} + { "return": [ { @@ -4317,6 +4570,11 @@ "id": "libvirt-36" } +{ + "execute": "query-machines", + "id": "libvirt-37" +} + { "return": [ { @@ -4430,6 +4688,11 @@ "id": "libvirt-37" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-38" +} + { "return": [ { @@ -6606,18 +6869,33 @@ "id": "libvirt-38" } +{ + "execute": "query-tpm-models", + "id": "libvirt-39" +} + { "return": [ ], "id": "libvirt-39" } +{ + "execute": "query-tpm-types", + "id": "libvirt-40" +} + { "return": [ ], "id": "libvirt-40" } +{ + "execute": "query-command-line-options", + "id": "libvirt-41" +} + { "return": [ { @@ -7728,6 +8006,11 @@ "id": "libvirt-41" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-42" +} + { "return": [ { @@ -7770,6 +8053,11 @@ "id": "libvirt-42" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-43" +} + { "return": [ { @@ -17056,12 +17344,22 @@ "id": "libvirt-43" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 06499bf666..cb765a0217 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -152,7 +152,7 @@ <flag name='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>346538</microcodeVersion> + <microcodeVersion>350710</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 967148a022..919e41571c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 9, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "s390x" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -485,6 +490,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 16, @@ -493,6 +507,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -501,6 +523,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -509,6 +536,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -626,6 +658,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1268,6 +1305,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1496,6 +1541,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -1775,6 +1828,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -1936,6 +1997,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-13" +} + { "return": [ { @@ -2074,6 +2143,14 @@ "id": "libvirt-13" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-14" +} + { "return": [ { @@ -2267,6 +2344,14 @@ "id": "libvirt-14" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-15" +} + { "return": [ { @@ -2342,6 +2427,14 @@ "id": "libvirt-15" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2350,6 +2443,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-17" +} + { "id": "libvirt-17", "error": { @@ -2358,6 +2459,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-18" +} + { "id": "libvirt-18", "error": { @@ -2366,6 +2475,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2473,6 +2590,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2587,6 +2712,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-21" +} + { "id": "libvirt-21", "error": { @@ -2595,6 +2728,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-22" +} + { "id": "libvirt-22", "error": { @@ -2603,6 +2744,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "id": "libvirt-23", "error": { @@ -2611,6 +2760,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -2638,6 +2795,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "id": "libvirt-25", "error": { @@ -2646,6 +2811,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "id": "libvirt-26", "error": { @@ -2654,6 +2827,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-27" +} + { "id": "libvirt-27", "error": { @@ -2662,6 +2843,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -2805,6 +2994,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -2844,6 +3041,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-30" +} + { "id": "libvirt-30", "error": { @@ -2852,6 +3057,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -2995,6 +3208,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3057,6 +3278,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3101,6 +3330,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtual-css-bridge" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3111,6 +3348,11 @@ "id": "libvirt-34" } +{ + "execute": "query-machines", + "id": "libvirt-35" +} + { "return": [ { @@ -3154,6 +3396,11 @@ "id": "libvirt-35" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-36" +} + { "return": [ { @@ -3544,18 +3791,33 @@ "id": "libvirt-36" } +{ + "execute": "query-tpm-models", + "id": "libvirt-37" +} + { "return": [ ], "id": "libvirt-37" } +{ + "execute": "query-tpm-types", + "id": "libvirt-38" +} + { "return": [ ], "id": "libvirt-38" } +{ + "execute": "query-command-line-options", + "id": "libvirt-39" +} + { "return": [ { @@ -4631,6 +4893,11 @@ "id": "libvirt-39" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-40" +} + { "return": [ { @@ -4673,6 +4940,11 @@ "id": "libvirt-40" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-41" +} + { "return": [ { @@ -13959,6 +14231,17 @@ "id": "libvirt-41" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-42" +} + { "return": { "model": { @@ -13986,6 +14269,20 @@ "id": "libvirt-42" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-43" +} + { "id": "libvirt-43", "error": { @@ -13994,12 +14291,22 @@ } } +{ + "execute": "qmp_capabilities", + "id": "libvirt-44" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-45" +} + { "return": [ { @@ -14390,6 +14697,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-46" +} + { "id": "libvirt-3", "error": { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 9d67f087d5..36abf225e1 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -116,7 +116,7 @@ <flag name='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>265159</microcodeVersion> + <microcodeVersion>269628</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 5da1b41c2e..9f964c705c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -1,16 +1,6 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 9, - "major": 2 - }, - "package": " (v2.9.0)" - }, - "capabilities": [ - ] - } + "execute": "qmp_capabilities", + "id": "libvirt-1" } { @@ -19,6 +9,11 @@ "id": "libvirt-1" } +{ + "execute": "query-version", + "id": "libvirt-2" +} + { "return": { "qemu": { @@ -31,6 +26,11 @@ "id": "libvirt-2" } +{ + "execute": "query-target", + "id": "libvirt-3" +} + { "return": { "arch": "x86_64" @@ -38,6 +38,11 @@ "id": "libvirt-3" } +{ + "execute": "query-commands", + "id": "libvirt-4" +} + { "return": [ { @@ -482,6 +487,15 @@ "id": "libvirt-4" } +{ + "execute": "add-fd", + "arguments": { + "fdset-id": 0, + "opaque": "/dev/null" + }, + "id": "libvirt-5" +} + { "return": { "fd": 15, @@ -490,6 +504,14 @@ "id": "libvirt-5" } +{ + "execute": "block-commit", + "arguments": { + "device": "bogus" + }, + "id": "libvirt-6" +} + { "id": "libvirt-6", "error": { @@ -498,6 +520,11 @@ } } +{ + "execute": "query-kvm", + "id": "libvirt-7" +} + { "return": { "enabled": true, @@ -506,6 +533,11 @@ "id": "libvirt-7" } +{ + "execute": "query-events", + "id": "libvirt-8" +} + { "return": [ { @@ -623,6 +655,11 @@ "id": "libvirt-8" } +{ + "execute": "qom-list-types", + "id": "libvirt-9" +} + { "return": [ { @@ -1754,6 +1791,14 @@ "id": "libvirt-9" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-pci" + }, + "id": "libvirt-10" +} + { "return": [ { @@ -1982,6 +2027,14 @@ "id": "libvirt-10" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-pci" + }, + "id": "libvirt-11" +} + { "return": [ { @@ -2261,6 +2314,14 @@ "id": "libvirt-11" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-pci" + }, + "id": "libvirt-12" +} + { "return": [ { @@ -2422,6 +2483,14 @@ "id": "libvirt-12" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-ccw" + }, + "id": "libvirt-13" +} + { "id": "libvirt-13", "error": { @@ -2430,6 +2499,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-scsi-ccw" + }, + "id": "libvirt-14" +} + { "id": "libvirt-14", "error": { @@ -2438,6 +2515,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-net-s390" + }, + "id": "libvirt-15" +} + { "id": "libvirt-15", "error": { @@ -2446,6 +2531,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "pci-assign" + }, + "id": "libvirt-16" +} + { "id": "libvirt-16", "error": { @@ -2454,6 +2547,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pci-assign" + }, + "id": "libvirt-17" +} + { "return": [ { @@ -2516,6 +2617,14 @@ "id": "libvirt-17" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vfio-pci" + }, + "id": "libvirt-18" +} + { "return": [ { @@ -2623,6 +2732,14 @@ "id": "libvirt-18" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-disk" + }, + "id": "libvirt-19" +} + { "return": [ { @@ -2737,6 +2854,14 @@ "id": "libvirt-19" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ide-drive" + }, + "id": "libvirt-20" +} + { "return": [ { @@ -2813,6 +2938,14 @@ "id": "libvirt-20" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "PIIX4_PM" + }, + "id": "libvirt-21" +} + { "return": [ { @@ -2876,6 +3009,14 @@ "id": "libvirt-21" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-redir" + }, + "id": "libvirt-22" +} + { "return": [ { @@ -2925,6 +3066,14 @@ "id": "libvirt-22" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-host" + }, + "id": "libvirt-23" +} + { "return": [ { @@ -2994,6 +3143,14 @@ "id": "libvirt-23" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "scsi-generic" + }, + "id": "libvirt-24" +} + { "return": [ { @@ -3021,6 +3178,14 @@ "id": "libvirt-24" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "i440FX-pcihost" + }, + "id": "libvirt-25" +} + { "return": [ { @@ -3059,6 +3224,14 @@ "id": "libvirt-25" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "q35-pcihost" + }, + "id": "libvirt-26" +} + { "return": [ { @@ -3137,6 +3310,14 @@ "id": "libvirt-26" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "usb-storage" + }, + "id": "libvirt-27" +} + { "return": [ { @@ -3210,6 +3391,14 @@ "id": "libvirt-27" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "kvm-pit" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -3224,6 +3413,14 @@ "id": "libvirt-28" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "VGA" + }, + "id": "libvirt-29" +} + { "return": [ { @@ -3281,6 +3478,14 @@ "id": "libvirt-29" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "vmware-svga" + }, + "id": "libvirt-30" +} + { "return": [ { @@ -3324,6 +3529,14 @@ "id": "libvirt-30" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "qxl" + }, + "id": "libvirt-31" +} + { "return": [ { @@ -3411,6 +3624,14 @@ "id": "libvirt-31" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-pci" + }, + "id": "libvirt-32" +} + { "return": [ { @@ -3564,6 +3785,14 @@ "id": "libvirt-32" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-gpu-device" + }, + "id": "libvirt-33" +} + { "return": [ { @@ -3613,6 +3842,14 @@ "id": "libvirt-33" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-34" +} + { "return": [ { @@ -3709,6 +3946,14 @@ "id": "libvirt-34" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-pci" + }, + "id": "libvirt-35" +} + { "return": [ { @@ -3852,6 +4097,14 @@ "id": "libvirt-35" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-ccw" + }, + "id": "libvirt-36" +} + { "id": "libvirt-36", "error": { @@ -3860,6 +4113,14 @@ } } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-balloon-device" + }, + "id": "libvirt-37" +} + { "return": [ { @@ -3904,6 +4165,14 @@ "id": "libvirt-37" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "nec-usb-xhci" + }, + "id": "libvirt-38" +} + { "return": [ { @@ -3984,6 +4253,14 @@ "id": "libvirt-38" } +{ + "execute": "device-list-properties", + "arguments": { + "typename": "intel-iommu" + }, + "id": "libvirt-39" +} + { "return": [ { @@ -4015,6 +4292,11 @@ "id": "libvirt-39" } +{ + "execute": "query-machines", + "id": "libvirt-40" +} + { "return": [ { @@ -4194,6 +4476,11 @@ "id": "libvirt-40" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-41" +} + { "return": [ { @@ -4476,6 +4763,11 @@ "id": "libvirt-41" } +{ + "execute": "query-tpm-models", + "id": "libvirt-42" +} + { "return": [ "tpm-tis" @@ -4483,6 +4775,11 @@ "id": "libvirt-42" } +{ + "execute": "query-tpm-types", + "id": "libvirt-43" +} + { "return": [ "passthrough" @@ -4490,6 +4787,11 @@ "id": "libvirt-43" } +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + { "return": [ { @@ -5739,6 +6041,11 @@ "id": "libvirt-44" } +{ + "execute": "query-migrate-capabilities", + "id": "libvirt-45" +} + { "return": [ { @@ -5781,6 +6088,11 @@ "id": "libvirt-45" } +{ + "execute": "query-qmp-schema", + "id": "libvirt-46" +} + { "return": [ { @@ -15067,6 +15379,17 @@ "id": "libvirt-46" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host" + } + }, + "id": "libvirt-47" +} + { "return": { "model": { @@ -15246,6 +15569,187 @@ "id": "libvirt-47" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": true, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": true, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": true, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": true, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-48" +} + { "return": { "model": { @@ -15487,6 +15991,20 @@ "id": "libvirt-48" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "host", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-49" +} + { "return": { "model": { @@ -15666,6 +16184,187 @@ "id": "libvirt-49" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": true, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": true, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": true, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": true, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-50" +} + { "return": { "model": { @@ -15907,12 +16606,22 @@ "id": "libvirt-50" } +{ + "execute": "qmp_capabilities", + "id": "libvirt-51" +} + { "return": { }, "id": "libvirt-1" } +{ + "execute": "query-cpu-definitions", + "id": "libvirt-52" +} + { "return": [ { @@ -16258,6 +16967,17 @@ "id": "libvirt-2" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max" + } + }, + "id": "libvirt-53" +} + { "return": { "model": { @@ -16437,6 +17157,187 @@ "id": "libvirt-3" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": false, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": true, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "AuthenticAMD", + "pku": true, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": true, + "npt": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": false, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": false, + "tm": false, + "kvmclock-stable-bit": false, + "hypervisor": true, + "pcommit": true, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": false, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 6, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": false, + "fma": false, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": true, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": false, + "kvm-steal-time": false, + "kvmclock": false, + "lwp": false, + "xop": false, + "avx": false, + "ospke": true, + "acpi": true, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": false, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483658, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": false, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": true, + "avx512er": false, + "pmm-en": false, + "pcid": false, + "3dnow": true, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": false, + "rdseed": false, + "avx512-4vnniw": false, + "vme": false, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "QEMU TCG CPU version 2.5+", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-54" +} + { "return": { "model": { @@ -16678,6 +17579,20 @@ "id": "libvirt-4" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "static", + "model": { + "name": "max", + "props": { + "migratable": false + } + } + }, + "id": "libvirt-55" +} + { "return": { "model": { @@ -16857,6 +17772,187 @@ "id": "libvirt-5" } +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": false, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": true, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "AuthenticAMD", + "pku": true, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": true, + "npt": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": false, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": false, + "tm": false, + "kvmclock-stable-bit": false, + "hypervisor": true, + "pcommit": true, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": false, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": false, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 6, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": false, + "fma": false, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": true, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": false, + "kvm-steal-time": false, + "kvmclock": false, + "lwp": false, + "xop": false, + "avx": false, + "ospke": true, + "acpi": true, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": false, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483658, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": false, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": true, + "avx512er": false, + "pmm-en": false, + "pcid": false, + "3dnow": true, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": false, + "rdseed": false, + "avx512-4vnniw": false, + "vme": false, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "QEMU TCG CPU version 2.5+", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-56" +} + { "return": { "model": { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 33412b5a9a..be6095a2f6 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='vhost-vsock'/> <version>2009000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>320947</microcodeVersion> + <microcodeVersion>343515</microcodeVersion> <package> (v2.9.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> -- 2.16.2
On Fri, Jun 01, 2018 at 10:20:00 +0200, Peter Krempa wrote:
This is supposed to be squashed in into the previous patch.
The files were regenerated by instrumenting the qemucapabilitiestest with the LD_PRELOAD hack used to gather the data in qemucapsprobe. See next patch ---
[...]
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 8da1b149d0..cbc5f5570e 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
[...]
@@ -3100,12 +3383,22 @@ "id": "libvirt-42" }
+{ + "execute": "qmp_capabilities", + "id": "libvirt-43" +} + { "return": { }, "id": "libvirt-1" }
+{ + "execute": "query-cpu-definitions", + "id": "libvirt-44" +} + { "return": [ {
Hmpf, looks like I forgot to use the new API introduced in patch 1 so these are now numbered incorrectly.
Use the LD_PRELOAD .so library used in 'qemucapsprobe' to regenerate the files. The library is instrumented to write the replies to 'caps.json' and instrumentation in the test move it to the correct place. Use 'fix-files.sh' to do so as it's using a static variable to track the initial newline. --- fix-files.sh | 1 + tests/Makefile.am | 1 + tests/qemucapabilitiestest.c | 4 +++- tests/qemucapsprobemock.c | 11 +++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 fix-files.sh diff --git a/fix-files.sh b/fix-files.sh new file mode 100755 index 0000000000..93465b96db --- /dev/null +++ b/fix-files.sh @@ -0,0 +1 @@ +for i in `seq 0 50`; do VIR_TEST_RANGE="$i" ./tests/qemucapabilitiestest; done diff --git a/tests/Makefile.am b/tests/Makefile.am index 1ce3dbb50f..a805b1b837 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -604,6 +604,7 @@ qemucapabilitiestest_SOURCES = \ testutilsqemu.c testutilsqemu.h \ $(NULL) qemucapabilitiestest_LDADD = libqemumonitortestutils.la \ + libqemutestdriver.la \ $(qemu_LDADDS) $(LDADDS) qemucapsprobe_SOURCES = \ diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index cf94bc9d36..e554f089cc 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -78,6 +78,8 @@ testQemuCaps(const void *opaque) if (virTestCompareToFile(actual, capsFile) < 0) goto cleanup; + rename(abs_srcdir "/caps.json", repliesFile); + ret = 0; cleanup: VIR_FREE(repliesFile); @@ -199,4 +201,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemucapsprobemock.so") diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index 5936975505..9b691dcf0e 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -25,6 +25,7 @@ #include "internal.h" #include "viralloc.h" #include "virjson.h" +#include "virfile.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_monitor_json.h" @@ -38,19 +39,29 @@ } while (0) static bool first = true; +static const char *dumppath = abs_srcdir "/caps.json"; static void printLineSkipEmpty(const char *line, FILE *fp) { + FILE *fp2; const char *p; + if (!(fp2 = fopen(dumppath, "a"))) { + fprintf(stderr, "failed to open '%s'", dumppath); + abort(); + } + for (p = line; *p; p++) { if (p[0] == '\n' && p[1] == '\n') continue; fputc(*p, fp); + fputc(*p, fp2); } + + VIR_FORCE_FCLOSE(fp2); } -- 2.16.2
participants (1)
-
Peter Krempa