[libvirt] [PATCH 05/55] tests: qemucapabilities: Update capability data for qemu 3.0.0

The diff contains changes from the change of the JSON library reformatting as well as dropping of the preconfig state and adding of the 'qdev' field to output of 'query-blockstats'. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 591 +++------------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 8 +- 2 files changed, 88 insertions(+), 511 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index b2f8377248..714fac5a6f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -4,8 +4,7 @@ } { - "return": { - }, + "return": {}, "id": "libvirt-1" } @@ -17,11 +16,11 @@ { "return": { "qemu": { - "micro": 90, + "micro": 93, "minor": 12, "major": 2 }, - "package": "v3.0.0-rc0-31-g633e824037" + "package": "v3.0.0-rc3-17-g09b94ac0f2" }, "id": "libvirt-2" } @@ -175,7 +174,7 @@ "name": "system_wakeup" }, { - "name": "exit-preconfig" + "name": "x-exit-preconfig" }, { "name": "cont" @@ -5346,40 +5345,35 @@ { "name": "max", "typename": "max-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": false }, { "name": "host", "typename": "host-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": false }, { "name": "base", "typename": "base-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": true, "migration-safe": true }, { "name": "qemu64", "typename": "qemu64-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "qemu32", "typename": "qemu32-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -5400,64 +5394,56 @@ { "name": "pentium3", "typename": "pentium3-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "pentium2", "typename": "pentium2-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "pentium", "typename": "pentium-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "n270", "typename": "n270-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "kvm64", "typename": "kvm64-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "kvm32", "typename": "kvm32-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "coreduo", "typename": "coreduo-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "core2duo", "typename": "core2duo-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -5475,16 +5461,14 @@ { "name": "Westmere-IBRS", "typename": "Westmere-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Westmere", "typename": "Westmere-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -5525,40 +5509,35 @@ { "name": "Skylake-Client-IBRS", "typename": "Skylake-Client-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Skylake-Client", "typename": "Skylake-Client-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "SandyBridge-IBRS", "typename": "SandyBridge-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "SandyBridge", "typename": "SandyBridge-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Penryn", "typename": "Penryn-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -5600,32 +5579,28 @@ { "name": "Opteron_G2", "typename": "Opteron_G2-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Opteron_G1", "typename": "Opteron_G1-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Nehalem-IBRS", "typename": "Nehalem-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Nehalem", "typename": "Nehalem-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -5650,48 +5625,42 @@ { "name": "IvyBridge-IBRS", "typename": "IvyBridge-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "IvyBridge", "typename": "IvyBridge-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Haswell-noTSX-IBRS", "typename": "Haswell-noTSX-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Haswell-noTSX", "typename": "Haswell-noTSX-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Haswell-IBRS", "typename": "Haswell-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Haswell", "typename": "Haswell-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -5729,48 +5698,42 @@ { "name": "Conroe", "typename": "Conroe-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Broadwell-noTSX-IBRS", "typename": "Broadwell-noTSX-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Broadwell-noTSX", "typename": "Broadwell-noTSX-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Broadwell-IBRS", "typename": "Broadwell-IBRS-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Broadwell", "typename": "Broadwell-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "486", "typename": "486-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true } @@ -6065,13 +6028,11 @@ "option": "spice" }, { - "parameters": [ - ], + "parameters": [], "option": "smbios" }, { - "parameters": [ - ], + "parameters": [], "option": "acpi" }, { @@ -6347,8 +6308,7 @@ "option": "icount" }, { - "parameters": [ - ], + "parameters": [], "option": "numa" }, { @@ -6390,13 +6350,11 @@ "option": "realtime" }, { - "parameters": [ - ], + "parameters": [], "option": "tpmdev" }, { - "parameters": [ - ], + "parameters": [], "option": "object" }, { @@ -6700,23 +6658,19 @@ "option": "rtc" }, { - "parameters": [ - ], + "parameters": [], "option": "net" }, { - "parameters": [ - ], + "parameters": [], "option": "nic" }, { - "parameters": [ - ], + "parameters": [], "option": "netdev" }, { - "parameters": [ - ], + "parameters": [], "option": "device" }, { @@ -7193,8 +7147,6 @@ { "name": "query-status", "ret-type": "1", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, @@ -7246,8 +7198,6 @@ { "name": "watchdog-set-action", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "5" }, @@ -7264,368 +7214,276 @@ { "name": "job-pause", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "8" }, { "name": "job-resume", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "9" }, { "name": "job-cancel", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "10" }, { "name": "job-complete", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "11" }, { "name": "job-dismiss", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "12" }, { "name": "job-finalize", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "13" }, { "name": "query-jobs", "ret-type": "[14]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "x-block-latency-histogram-set", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "15" }, { "name": "query-block", "ret-type": "[16]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-blockstats", "ret-type": "[18]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "17" }, { "name": "query-block-jobs", "ret-type": "[19]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "block_passwd", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "20" }, { "name": "block_resize", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "21" }, { "name": "blockdev-snapshot-sync", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "22" }, { "name": "blockdev-snapshot", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "23" }, { "name": "change-backing-file", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "24" }, { "name": "block-commit", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "25" }, { "name": "drive-backup", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "26" }, { "name": "blockdev-backup", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "27" }, { "name": "query-named-block-nodes", "ret-type": "[28]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "drive-mirror", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "29" }, { "name": "block-dirty-bitmap-add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "30" }, { "name": "block-dirty-bitmap-remove", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "31" }, { "name": "block-dirty-bitmap-clear", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "31" }, { "name": "x-block-dirty-bitmap-enable", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "31" }, { "name": "x-block-dirty-bitmap-disable", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "31" }, { "name": "x-block-dirty-bitmap-merge", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "32" }, { "name": "x-debug-block-dirty-bitmap-sha256", "ret-type": "33", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "31" }, { "name": "blockdev-mirror", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "34" }, { "name": "block_set_io_throttle", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "35" }, { "name": "block-stream", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "36" }, { "name": "block-job-set-speed", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "37" }, { "name": "block-job-cancel", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "38" }, { "name": "block-job-pause", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "39" }, { "name": "block-job-resume", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "40" }, { "name": "block-job-complete", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "41" }, { "name": "block-job-dismiss", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "42" }, { "name": "block-job-finalize", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "43" }, { "name": "blockdev-add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "44" }, { "name": "blockdev-del", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "45" }, { "name": "blockdev-create", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "46" }, { "name": "blockdev-open-tray", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "47" }, { "name": "blockdev-close-tray", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "48" }, { "name": "blockdev-remove-medium", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "49" }, { "name": "blockdev-insert-medium", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "50" }, { "name": "blockdev-change-medium", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "51" }, @@ -7672,96 +7530,72 @@ { "name": "block-set-write-threshold", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "60" }, { "name": "x-blockdev-change", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "61" }, { "name": "x-blockdev-set-iothread", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "62" }, { "name": "query-pr-managers", "ret-type": "[63]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "blockdev-snapshot-internal-sync", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "64" }, { "name": "blockdev-snapshot-delete-internal-sync", "ret-type": "66", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "65" }, { "name": "eject", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "67" }, { "name": "nbd-server-start", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "68" }, { "name": "nbd-server-add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "69" }, { "name": "nbd-server-remove", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "70" }, { "name": "x-nbd-server-add-bitmap", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "71" }, { "name": "nbd-server-stop", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -7788,64 +7622,48 @@ { "name": "query-chardev", "ret-type": "[76]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-chardev-backends", "ret-type": "[77]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "ringbuf-write", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "78" }, { "name": "ringbuf-read", "ret-type": "str", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "79" }, { "name": "chardev-add", "ret-type": "81", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "80" }, { "name": "chardev-change", "ret-type": "81", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "82" }, { "name": "chardev-remove", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "83" }, { "name": "chardev-send-break", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "84" }, @@ -7857,32 +7675,24 @@ { "name": "set_link", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "86" }, { "name": "netdev_add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "87" }, { "name": "netdev_del", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "88" }, { "name": "query-rx-filter", "ret-type": "[90]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "89" }, @@ -7894,88 +7704,66 @@ { "name": "query-rocker", "ret-type": "93", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "92" }, { "name": "query-rocker-ports", "ret-type": "[95]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "94" }, { "name": "query-rocker-of-dpa-flows", "ret-type": "[97]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "96" }, { "name": "query-rocker-of-dpa-groups", "ret-type": "[99]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "98" }, { "name": "query-tpm-models", "ret-type": "[100]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-tpm-types", "ret-type": "[101]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-tpm", "ret-type": "[102]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "set_password", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "103" }, { "name": "expire_password", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "104" }, { "name": "screendump", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "105" }, { "name": "query-spice", "ret-type": "106", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8002,24 +7790,18 @@ { "name": "query-vnc", "ret-type": "110", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-vnc-servers", "ret-type": "[111]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "change-vnc-password", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "112" }, @@ -8041,80 +7823,60 @@ { "name": "query-mice", "ret-type": "[116]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "send-key", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "117" }, { "name": "input-send-event", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "118" }, { "name": "query-migrate", "ret-type": "119", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "migrate-set-capabilities", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "120" }, { "name": "query-migrate-capabilities", "ret-type": "[121]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "migrate-set-parameters", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "122" }, { "name": "query-migrate-parameters", "ret-type": "123", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "client_migrate_info", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "124" }, { "name": "migrate-start-postcopy", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8131,104 +7893,78 @@ { "name": "x-colo-lost-heartbeat", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "migrate_cancel", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "migrate-continue", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "127" }, { "name": "migrate_set_downtime", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "128" }, { "name": "migrate_set_speed", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "129" }, { "name": "migrate-set-cache-size", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "130" }, { "name": "query-migrate-cache-size", "ret-type": "int", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "migrate", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "131" }, { "name": "migrate-incoming", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "132" }, { "name": "xen-save-devices-state", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "133" }, { "name": "xen-set-replication", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "134" }, { "name": "query-xen-replication-status", "ret-type": "135", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "xen-colo-do-checkpoint", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8236,7 +7972,6 @@ "name": "migrate-recover", "ret-type": "0", "allow-oob": true, - "allow-preconfig": false, "meta-type": "command", "arg-type": "136" }, @@ -8244,135 +7979,102 @@ "name": "migrate-pause", "ret-type": "0", "allow-oob": true, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "transaction", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "137" }, { "name": "trace-event-get-state", "ret-type": "[139]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "138" }, { "name": "trace-event-set-state", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "140" }, { "name": "query-qmp-schema", "ret-type": "[141]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "qmp_capabilities", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "142" }, { "name": "query-version", "ret-type": "143", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-commands", "ret-type": "[144]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "add_client", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "145" }, { "name": "query-name", "ret-type": "146", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-kvm", "ret-type": "147", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-uuid", "ret-type": "148", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-events", "ret-type": "[149]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-cpus", "ret-type": "[150]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-cpus-fast", "ret-type": "[151]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-iothreads", "ret-type": "[152]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-balloon", "ret-type": "153", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8384,192 +8086,144 @@ { "name": "query-pci", "ret-type": "[155]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "quit", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "stop", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "system_reset", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "system_powerdown", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "cpu-add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "156" }, { "name": "memsave", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "157" }, { "name": "pmemsave", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "158" }, { "name": "cont", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { - "name": "exit-preconfig", + "name": "x-exit-preconfig", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "system_wakeup", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "inject-nmi", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "balloon", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "159" }, { "name": "human-monitor-command", "ret-type": "str", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "160" }, { "name": "qom-list", "ret-type": "[162]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "161" }, { "name": "qom-get", "ret-type": "any", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "163" }, { "name": "qom-set", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "164" }, { "name": "change", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "165" }, { "name": "qom-list-types", "ret-type": "[167]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "166" }, { "name": "device-list-properties", "ret-type": "[162]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "168" }, { "name": "qom-list-properties", "ret-type": "[162]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "169" }, { "name": "xen-set-global-dirty-log", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "170" }, { "name": "device_add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "171" }, { "name": "device_del", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "172" }, @@ -8581,16 +8235,12 @@ { "name": "dump-guest-memory", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "174" }, { "name": "query-dump", "ret-type": "175", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8602,152 +8252,114 @@ { "name": "query-dump-guest-memory-capability", "ret-type": "177", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "dump-skeys", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "178" }, { "name": "object-add", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "179" }, { "name": "object-del", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "180" }, { "name": "getfd", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "181" }, { "name": "closefd", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "182" }, { "name": "query-machines", "ret-type": "[183]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-memory-size-summary", "ret-type": "184", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-cpu-definitions", "ret-type": "[185]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-cpu-model-expansion", "ret-type": "187", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "186" }, { "name": "query-cpu-model-comparison", "ret-type": "189", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "188" }, { "name": "query-cpu-model-baseline", "ret-type": "191", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "190" }, { "name": "add-fd", "ret-type": "193", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "192" }, { "name": "remove-fd", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "194" }, { "name": "query-fdsets", "ret-type": "[195]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-target", "ret-type": "196", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-command-line-options", "ret-type": "[198]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "197" }, { "name": "query-memdev", "ret-type": "[199]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-memory-devices", "ret-type": "[200]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8759,8 +8371,6 @@ { "name": "query-acpi-ospm-status", "ret-type": "[202]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8772,8 +8382,6 @@ { "name": "rtc-reset-reinjection", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8785,56 +8393,42 @@ { "name": "xen-load-devices-state", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "205" }, { "name": "query-gic-capabilities", "ret-type": "[206]", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-hotpluggable-cpus", "ret-type": "[207]", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "0" }, { "name": "query-vm-generation-id", "ret-type": "208", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-sev", "ret-type": "209", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-sev-launch-measure", "ret-type": "210", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, { "name": "query-sev-capabilities", "ret-type": "211", - "allow-oob": false, - "allow-preconfig": false, "meta-type": "command", "arg-type": "0" }, @@ -8846,15 +8440,12 @@ { "name": "set-numa-node", "ret-type": "0", - "allow-oob": false, - "allow-preconfig": true, "meta-type": "command", "arg-type": "213" }, { "name": "0", - "members": [ - ], + "members": [], "meta-type": "object" }, { @@ -9146,6 +8737,11 @@ "default": null, "type": "str" }, + { + "name": "qdev", + "default": null, + "type": "str" + }, { "name": "node-name", "default": null, @@ -16222,10 +15818,7 @@ }, { "name": "allow-oob", - "type": "bool" - }, - { - "name": "allow-preconfig", + "default": null, "type": "bool" } ], @@ -19117,8 +18710,7 @@ }, { "name": "470", - "members": [ - ], + "members": [], "meta-type": "object" }, { @@ -19938,6 +19530,7 @@ "syscall": true, "level": 13, "avx512dq": false, + "x-migrate-smi-count": true, "svm": false, "full-cpuid-auto-level": true, "hv-reset": false, @@ -20602,6 +20195,7 @@ "syscall": true, "level": 13, "avx512dq": false, + "x-migrate-smi-count": true, "svm": false, "full-cpuid-auto-level": true, "hv-reset": false, @@ -20772,8 +20366,7 @@ } { - "return": { - }, + "return": {}, "id": "libvirt-1" } @@ -20787,8 +20380,7 @@ { "name": "max", "typename": "max-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": false }, @@ -20804,24 +20396,21 @@ { "name": "base", "typename": "base-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": true, "migration-safe": true }, { "name": "qemu64", "typename": "qemu64-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "qemu32", "typename": "qemu32-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -20837,72 +20426,63 @@ { "name": "pentium3", "typename": "pentium3-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "pentium2", "typename": "pentium2-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "pentium", "typename": "pentium-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "n270", "typename": "n270-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "kvm64", "typename": "kvm64-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "kvm32", "typename": "kvm32-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "coreduo", "typename": "coreduo-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "core2duo", "typename": "core2duo-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "athlon", "typename": "athlon-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -20918,8 +20498,7 @@ { "name": "Westmere", "typename": "Westmere-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -21049,8 +20628,7 @@ { "name": "Penryn", "typename": "Penryn-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -21095,16 +20673,14 @@ { "name": "Opteron_G2", "typename": "Opteron_G2-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, { "name": "Opteron_G1", "typename": "Opteron_G1-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -21120,8 +20696,7 @@ { "name": "Nehalem", "typename": "Nehalem-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -21296,8 +20871,7 @@ { "name": "Conroe", "typename": "Conroe-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true }, @@ -21386,8 +20960,7 @@ { "name": "486", "typename": "486-x86_64-cpu", - "unavailable-features": [ - ], + "unavailable-features": [], "static": false, "migration-safe": true } @@ -21905,6 +21478,7 @@ "syscall": true, "level": 13, "avx512dq": false, + "x-migrate-smi-count": true, "svm": true, "full-cpuid-auto-level": true, "hv-reset": false, @@ -22569,6 +22143,7 @@ "syscall": true, "level": 13, "avx512dq": false, + "x-migrate-smi-count": true, "svm": true, "full-cpuid-auto-level": true, "hv-reset": false, diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 4bc7cfeebc..a2c6085de7 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -216,10 +216,10 @@ <flag name='usb-storage.werror'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> - <version>2012090</version> + <version>2012093</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>438109</microcodeVersion> - <package>v3.0.0-rc0-31-g633e824037</package> + <microcodeVersion>427343</microcodeVersion> + <package>v3.0.0-rc3-17-g09b94ac0f2</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> @@ -328,6 +328,7 @@ <property name='syscall' type='boolean' value='true' migratable='yes'/> <property name='level' type='number' value='13'/> <property name='avx512dq' type='boolean' value='false'/> + <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/> <property name='svm' type='boolean' value='false'/> <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/> <property name='hv-reset' type='boolean' value='false'/> @@ -581,6 +582,7 @@ <property name='syscall' type='boolean' value='true' migratable='yes'/> <property name='level' type='number' value='13'/> <property name='avx512dq' type='boolean' value='false'/> + <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/> <property name='svm' type='boolean' value='true' migratable='yes'/> <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/> <property name='hv-reset' type='boolean' value='false'/> -- 2.16.2