[PATCH 00/10] qemu: Update capabilities and use 'tls-hostname' field for NBD
Technically patch 7/10 is more of a RFC for now as my migration setup doesn't work properly so I could not test it. Peter Krempa (10): tests: qemucapabilities: Update caps_7.0.0.x86_64 qemu: capabilities: Introduce QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME qemuMigrationSrcRun: Fix misleading comment about NBD with TLS support storage_source: Add 'tlsHostname' field to virStorageSource qemu: Add support for 'tlsHostname' setting of virStorageSource conf: Add support for setting expected TLS hostname for NBD disks qemu: migration: Use 'VIR_MIGRATE_PARAM_TLS_DESTINATION' for the NBD connection NEWS: Mention that VIR_MIGRATE_PARAM_TLS_DESTINATION works now for non-shared storage migration qemuMigrationSrcNBDStorageCopyOne: Refactor cleanup qemuBlockJobDiskNew: Remove misleading return value description NEWS.rst | 6 + docs/formatdomain.rst | 4 +- docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 3 + src/conf/storage_source_conf.c | 2 + src/conf/storage_source_conf.h | 3 + src/qemu/qemu_block.c | 6 +- src/qemu/qemu_blockjob.c | 2 - src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_domain.c | 15 + src/qemu/qemu_migration.c | 46 +- src/qemu/qemu_migration_params.c | 17 + src/qemu/qemu_migration_params.h | 3 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../caps_7.0.0.x86_64.replies | 2202 +++++++++-------- .../caps_7.0.0.x86_64.xml | 43 +- ...work-tlsx509-nbd-hostname.x86_64-6.2.0.err | 1 + ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 38 + .../disk-network-tlsx509-nbd-hostname.xml | 31 + tests/qemuxml2argvtest.c | 2 + ...ork-tlsx509-nbd-hostname.x86_64-latest.xml | 37 + tests/qemuxml2xmltest.c | 1 + 23 files changed, 1390 insertions(+), 1083 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml -- 2.35.1
Update to commit v6.2.0-2296-g9f0369efb0 Notable changes: - 'tls-hostname' field for NBD client to override local hostname - machine types 'pc-i440fx-1.7' and older are now deprecated - 'snapshot-access' block driver added - The 'protocol' field of 'set_password' and 'expire_password' parameter is now an enum instead of a pure string allowing 'vnc' and 'spice' as value and the arguments are also covered by the schema. - 'copy-before-write' block driver now has a 'bitmap' property - 'query-migrate' now reports 'precopy-bytes', 'downtime-bytes', 'postcopy-bytes' for 'ram' and 'disk' statistics - RTC_CHANGE event now has a 'qom-path' property to identify the RTC - 'umip' cpu feature is now migratable - SGX property 'section-size' reinstated after regression Changes in build setting: - fuse block export support now enabled Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../caps_7.0.0.x86_64.replies | 2202 +++++++++-------- .../caps_7.0.0.x86_64.xml | 42 +- 3 files changed, 1186 insertions(+), 1059 deletions(-) diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index e16f70ab0d..edd1259c64 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -46,6 +46,7 @@ <feature policy='require' name='mpx'/> <feature policy='require' name='pcommit'/> <feature policy='require' name='clwb'/> + <feature policy='require' name='umip'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> <feature policy='require' name='3dnowext'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies index 3d92303f79..82ccbab6eb 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies @@ -21,7 +21,7 @@ "minor": 2, "major": 6 }, - "package": "v6.2.0-874-g1cd2ad11d3" + "package": "v6.2.0-2347-gd9ccf33f94" }, "id": "libvirt-2" } @@ -3231,6 +3231,10 @@ "case": "replication", "type": "299" }, + { + "case": "snapshot-access", + "type": "277" + }, { "case": "ssh", "type": "300" @@ -3920,6 +3924,10 @@ { "case": "vhost-user-blk", "type": "314" + }, + { + "case": "fuse", + "type": "315" } ], "members": [ @@ -4758,10 +4766,21 @@ }, { "name": "119", + "tag": "protocol", + "variants": [ + { + "case": "vnc", + "type": "341" + }, + { + "case": "spice", + "type": "0" + } + ], "members": [ { "name": "protocol", - "type": "str" + "type": "339" }, { "name": "password", @@ -4770,17 +4789,28 @@ { "name": "connected", "default": null, - "type": "str" + "type": "340" } ], "meta-type": "object" }, { "name": "120", + "tag": "protocol", + "variants": [ + { + "case": "vnc", + "type": "342" + }, + { + "case": "spice", + "type": "0" + } + ], "members": [ { "name": "protocol", - "type": "str" + "type": "339" }, { "name": "time", @@ -4847,12 +4877,12 @@ }, { "name": "mouse-mode", - "type": "339" + "type": "343" }, { "name": "channels", "default": null, - "type": "[340]" + "type": "[344]" } ], "meta-type": "object" @@ -4862,11 +4892,11 @@ "members": [ { "name": "server", - "type": "341" + "type": "345" }, { "name": "client", - "type": "341" + "type": "345" } ], "meta-type": "object" @@ -4876,11 +4906,11 @@ "members": [ { "name": "server", - "type": "342" + "type": "346" }, { "name": "client", - "type": "340" + "type": "344" } ], "meta-type": "object" @@ -4890,11 +4920,11 @@ "members": [ { "name": "server", - "type": "341" + "type": "345" }, { "name": "client", - "type": "341" + "type": "345" } ], "meta-type": "object" @@ -4914,7 +4944,7 @@ { "name": "family", "default": null, - "type": "343" + "type": "347" }, { "name": "service", @@ -4929,7 +4959,7 @@ { "name": "clients", "default": null, - "type": "[344]" + "type": "[348]" } ], "meta-type": "object" @@ -4948,20 +4978,20 @@ }, { "name": "server", - "type": "[345]" + "type": "[349]" }, { "name": "clients", - "type": "[344]" + "type": "[348]" }, { "name": "auth", - "type": "346" + "type": "350" }, { "name": "vencrypt", "default": null, - "type": "347" + "type": "351" }, { "name": "display", @@ -4986,11 +5016,11 @@ "members": [ { "name": "server", - "type": "348" + "type": "352" }, { "name": "client", - "type": "349" + "type": "353" } ], "meta-type": "object" @@ -5000,11 +5030,11 @@ "members": [ { "name": "server", - "type": "348" + "type": "352" }, { "name": "client", - "type": "344" + "type": "348" } ], "meta-type": "object" @@ -5014,11 +5044,11 @@ "members": [ { "name": "server", - "type": "348" + "type": "352" }, { "name": "client", - "type": "344" + "type": "348" } ], "meta-type": "object" @@ -5055,7 +5085,7 @@ "members": [ { "name": "keys", - "type": "[350]" + "type": "[354]" }, { "name": "hold-time", @@ -5080,7 +5110,7 @@ }, { "name": "events", - "type": "[351]" + "type": "[355]" } ], "meta-type": "object" @@ -5091,15 +5121,15 @@ "variants": [ { "case": "curses", - "type": "355" + "type": "359" }, { "case": "egl-headless", - "type": "356" + "type": "360" }, { "case": "dbus", - "type": "357" + "type": "361" }, { "case": "default", @@ -5121,7 +5151,7 @@ "members": [ { "name": "type", - "type": "352" + "type": "356" }, { "name": "full-screen", @@ -5141,7 +5171,7 @@ { "name": "gl", "default": null, - "type": "353" + "type": "357" } ], "meta-type": "object" @@ -5152,13 +5182,13 @@ "variants": [ { "case": "vnc", - "type": "359" + "type": "363" } ], "members": [ { "name": "type", - "type": "358" + "type": "362" } ], "meta-type": "object" @@ -5169,27 +5199,27 @@ { "name": "status", "default": null, - "type": "360" + "type": "364" }, { "name": "ram", "default": null, - "type": "361" + "type": "365" }, { "name": "disk", "default": null, - "type": "361" + "type": "365" }, { "name": "vfio", "default": null, - "type": "362" + "type": "366" }, { "name": "xbzrle-cache", "default": null, - "type": "363" + "type": "367" }, { "name": "total-time", @@ -5239,12 +5269,12 @@ { "name": "compression", "default": null, - "type": "364" + "type": "368" }, { "name": "socket-address", "default": null, - "type": "[365]" + "type": "[369]" } ], "meta-type": "object" @@ -5269,7 +5299,7 @@ "members": [ { "name": "capability", - "type": "366" + "type": "370" }, { "name": "state", @@ -5402,7 +5432,7 @@ { "name": "multifd-compression", "default": null, - "type": "367" + "type": "371" }, { "name": "multifd-zlib-level", @@ -5417,7 +5447,7 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[368]" + "type": "[372]" } ], "meta-type": "object" @@ -5546,7 +5576,7 @@ { "name": "multifd-compression", "default": null, - "type": "367" + "type": "371" }, { "name": "multifd-zlib-level", @@ -5561,7 +5591,7 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[368]" + "type": "[372]" } ], "meta-type": "object" @@ -5600,7 +5630,7 @@ "members": [ { "name": "status", - "type": "360" + "type": "364" } ], "meta-type": "object" @@ -5620,11 +5650,11 @@ "members": [ { "name": "mode", - "type": "369" + "type": "373" }, { "name": "reason", - "type": "370" + "type": "374" } ], "meta-type": "object" @@ -5634,7 +5664,7 @@ "members": [ { "name": "state", - "type": "360" + "type": "364" } ], "meta-type": "object" @@ -5753,15 +5783,15 @@ "members": [ { "name": "mode", - "type": "369" + "type": "373" }, { "name": "last-mode", - "type": "369" + "type": "373" }, { "name": "reason", - "type": "370" + "type": "374" } ], "meta-type": "object" @@ -5801,7 +5831,7 @@ { "name": "mode", "default": null, - "type": "371" + "type": "375" } ], "meta-type": "object" @@ -5816,7 +5846,7 @@ }, { "name": "status", - "type": "372" + "type": "376" }, { "name": "start-time", @@ -5832,12 +5862,12 @@ }, { "name": "mode", - "type": "371" + "type": "375" }, { "name": "vcpu-dirty-rate", "default": null, - "type": "[373]" + "type": "[377]" } ], "meta-type": "object" @@ -5909,12 +5939,12 @@ "members": [ { "name": "actions", - "type": "[374]" + "type": "[378]" }, { "name": "properties", "default": null, - "type": "375" + "type": "379" } ], "meta-type": "object" @@ -5948,7 +5978,7 @@ }, { "name": "state", - "type": "376" + "type": "380" }, { "name": "vcpu", @@ -5987,7 +6017,7 @@ { "name": "enable", "default": null, - "type": "[377]" + "type": "[381]" } ], "meta-type": "object" @@ -5997,7 +6027,7 @@ "members": [ { "name": "qemu", - "type": "378" + "type": "382" }, { "name": "package", @@ -6032,31 +6062,31 @@ "variants": [ { "case": "builtin", - "type": "380" + "type": "384" }, { "case": "enum", - "type": "381" + "type": "385" }, { "case": "array", - "type": "382" + "type": "386" }, { "case": "object", - "type": "383" + "type": "387" }, { "case": "alternate", - "type": "384" + "type": "388" }, { "case": "command", - "type": "385" + "type": "389" }, { "case": "event", - "type": "386" + "type": "390" } ], "members": [ @@ -6066,7 +6096,7 @@ }, { "name": "meta-type", - "type": "379" + "type": "383" }, { "name": "features", @@ -6209,151 +6239,151 @@ "variants": [ { "case": "authz-list", - "type": "388" + "type": "392" }, { "case": "authz-listfile", - "type": "389" + "type": "393" }, { "case": "authz-pam", - "type": "390" + "type": "394" }, { "case": "authz-simple", - "type": "391" + "type": "395" }, { "case": "can-host-socketcan", - "type": "392" + "type": "396" }, { "case": "colo-compare", - "type": "393" + "type": "397" }, { "case": "cryptodev-backend", - "type": "394" + "type": "398" }, { "case": "cryptodev-backend-builtin", - "type": "394" + "type": "398" }, { "case": "cryptodev-vhost-user", - "type": "395" + "type": "399" }, { "case": "dbus-vmstate", - "type": "396" + "type": "400" }, { "case": "filter-buffer", - "type": "397" + "type": "401" }, { "case": "filter-dump", - "type": "398" + "type": "402" }, { "case": "filter-mirror", - "type": "399" + "type": "403" }, { "case": "filter-redirector", - "type": "400" + "type": "404" }, { "case": "filter-replay", - "type": "401" + "type": "405" }, { "case": "filter-rewriter", - "type": "402" + "type": "406" }, { "case": "input-barrier", - "type": "403" + "type": "407" }, { "case": "input-linux", - "type": "404" + "type": "408" }, { "case": "iothread", - "type": "405" + "type": "409" }, { "case": "memory-backend-epc", - "type": "406" + "type": "410" }, { "case": "memory-backend-file", - "type": "407" + "type": "411" }, { "case": "memory-backend-memfd", - "type": "408" + "type": "412" }, { "case": "memory-backend-ram", - "type": "409" + "type": "413" }, { "case": "pr-manager-helper", - "type": "410" + "type": "414" }, { "case": "qtest", - "type": "411" + "type": "415" }, { "case": "rng-builtin", - "type": "412" + "type": "416" }, { "case": "rng-egd", - "type": "413" + "type": "417" }, { "case": "rng-random", - "type": "414" + "type": "418" }, { "case": "secret", - "type": "415" + "type": "419" }, { "case": "secret_keyring", - "type": "416" + "type": "420" }, { "case": "sev-guest", - "type": "417" + "type": "421" }, { "case": "throttle-group", - "type": "418" + "type": "422" }, { "case": "tls-creds-anon", - "type": "419" + "type": "423" }, { "case": "tls-creds-psk", - "type": "420" + "type": "424" }, { "case": "tls-creds-x509", - "type": "421" + "type": "425" }, { "case": "tls-cipher-suites", - "type": "422" + "type": "426" }, { "case": "x-remote-object", - "type": "423" + "type": "427" }, { "case": "can-bus", @@ -6371,7 +6401,7 @@ "members": [ { "name": "qom-type", - "type": "387" + "type": "391" }, { "name": "id", @@ -6471,7 +6501,7 @@ "variants": [ { "case": "s390x", - "type": "426" + "type": "430" }, { "case": "aarch64", @@ -6606,11 +6636,11 @@ { "name": "props", "default": null, - "type": "424" + "type": "428" }, { "name": "target", - "type": "425" + "type": "429" } ], "meta-type": "object" @@ -6681,7 +6711,7 @@ "members": [ { "name": "arch", - "type": "425" + "type": "429" } ], "meta-type": "object" @@ -6805,7 +6835,7 @@ }, { "name": "policy", - "type": "427" + "type": "431" } ], "meta-type": "object" @@ -6828,7 +6858,7 @@ }, { "name": "props", - "type": "424" + "type": "428" }, { "name": "qom-path", @@ -6844,29 +6874,29 @@ "variants": [ { "case": "node", - "type": "429" + "type": "433" }, { "case": "dist", - "type": "430" + "type": "434" }, { "case": "cpu", - "type": "431" + "type": "435" }, { "case": "hmat-lb", - "type": "432" + "type": "436" }, { "case": "hmat-cache", - "type": "433" + "type": "437" } ], "members": [ { "name": "type", - "type": "428" + "type": "432" } ], "meta-type": "object" @@ -6927,29 +6957,29 @@ "variants": [ { "case": "dimm", - "type": "435" + "type": "439" }, { "case": "nvdimm", - "type": "435" + "type": "439" }, { "case": "virtio-pmem", - "type": "436" + "type": "440" }, { "case": "virtio-mem", - "type": "437" + "type": "441" }, { "case": "sgx-epc", - "type": "438" + "type": "442" } ], "members": [ { "name": "type", - "type": "434" + "type": "438" } ], "meta-type": "object" @@ -7002,11 +7032,11 @@ "members": [ { "name": "type", - "type": "441" + "type": "445" }, { "name": "model", - "type": "439" + "type": "443" } ], "meta-type": "object" @@ -7016,7 +7046,7 @@ "members": [ { "name": "model", - "type": "439" + "type": "443" } ], "meta-type": "object" @@ -7068,7 +7098,7 @@ "members": [ { "name": "mode", - "type": "442" + "type": "446" }, { "name": "filename", @@ -7123,11 +7153,11 @@ "variants": [ { "case": "block-node", - "type": "444" + "type": "448" }, { "case": "chardev", - "type": "445" + "type": "449" }, { "case": "migration", @@ -7137,7 +7167,7 @@ "members": [ { "name": "type", - "type": "443" + "type": "447" } ], "meta-type": "object" @@ -7306,7 +7336,7 @@ }, { "name": "fds", - "type": "[446]" + "type": "[450]" } ], "meta-type": "object" @@ -7336,7 +7366,7 @@ }, { "name": "parameters", - "type": "[447]" + "type": "[451]" } ], "meta-type": "object" @@ -7347,6 +7377,10 @@ { "name": "offset", "type": "int" + }, + { + "name": "qom-path", + "type": "str" } ], "meta-type": "object" @@ -7376,7 +7410,7 @@ }, { "name": "state", - "type": "448" + "type": "452" }, { "name": "handle", @@ -7475,9 +7509,16 @@ "name": "flc", "type": "bool" }, + { + "name": "section-size", + "type": "int", + "features": [ + "deprecated" + ] + }, { "name": "sections", - "type": "[449]" + "type": "[453]" } ], "meta-type": "object" @@ -7501,7 +7542,7 @@ }, { "name": "slot-type", - "type": "450" + "type": "454" }, { "name": "source", @@ -7538,7 +7579,7 @@ }, { "name": "devices", - "type": "[451]" + "type": "[455]" } ], "meta-type": "object" @@ -7782,17 +7823,17 @@ "variants": [ { "case": "hyper-v", - "type": "453" + "type": "457" }, { "case": "s390", - "type": "454" + "type": "458" } ], "members": [ { "name": "type", - "type": "452" + "type": "456" } ], "meta-type": "object" @@ -8011,22 +8052,22 @@ }, { "name": "timed_stats", - "type": "[455]" + "type": "[459]" }, { "name": "rd_latency_histogram", "default": null, - "type": "456" + "type": "460" }, { "name": "wr_latency_histogram", "default": null, - "type": "456" + "type": "460" }, { "name": "flush_latency_histogram", "default": null, - "type": "456" + "type": "460" } ], "meta-type": "object" @@ -8037,15 +8078,15 @@ "variants": [ { "case": "file", - "type": "457" + "type": "461" }, { "case": "host_device", - "type": "457" + "type": "461" }, { "case": "nvme", - "type": "458" + "type": "462" }, { "case": "blkdebug", @@ -8087,6 +8128,10 @@ "case": "dmg", "type": "0" }, + { + "case": "snapshot-access", + "type": "0" + }, { "case": "ftp", "type": "0" @@ -8461,7 +8506,7 @@ { "name": "format-specific", "default": null, - "type": "459" + "type": "463" } ], "meta-type": "object" @@ -8539,7 +8584,7 @@ }, { "name": "type", - "type": "460" + "type": "464" }, { "name": "name", @@ -8570,11 +8615,11 @@ }, { "name": "perm", - "type": "[461]" + "type": "[465]" }, { "name": "shared-perm", - "type": "[461]" + "type": "[465]" } ], "meta-type": "object" @@ -8648,6 +8693,9 @@ { "name": "file" }, + { + "name": "snapshot-access" + }, { "name": "ftp" }, @@ -8752,6 +8800,7 @@ "copy-on-read", "dmg", "file", + "snapshot-access", "ftp", "ftps", "gluster", @@ -8821,7 +8870,7 @@ "members": [ { "name": "image", - "type": "462" + "type": "466" }, { "name": "config", @@ -8861,22 +8910,22 @@ { "name": "inject-error", "default": null, - "type": "[463]" + "type": "[467]" }, { "name": "set-state", "default": null, - "type": "[464]" + "type": "[468]" }, { "name": "take-child-perms", "default": null, - "type": "[461]" + "type": "[465]" }, { "name": "unshare-child-perms", "default": null, - "type": "[461]" + "type": "[465]" } ], "meta-type": "object" @@ -8886,11 +8935,11 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "log", - "type": "462" + "type": "466" }, { "name": "log-sector-size", @@ -8915,11 +8964,11 @@ "members": [ { "name": "test", - "type": "462" + "type": "466" }, { "name": "raw", - "type": "462" + "type": "466" } ], "meta-type": "object" @@ -8929,7 +8978,7 @@ "members": [ { "name": "image", - "type": "462" + "type": "466" } ], "meta-type": "object" @@ -8939,7 +8988,7 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" } ], "meta-type": "object" @@ -8949,11 +8998,16 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "target", - "type": "462" + "type": "466" + }, + { + "name": "bitmap", + "default": null, + "type": "37" } ], "meta-type": "object" @@ -8963,7 +9017,7 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "bottom", @@ -8988,12 +9042,12 @@ { "name": "locking", "default": null, - "type": "465" + "type": "469" }, { "name": "aio", "default": null, - "type": "466" + "type": "470" }, { "name": "aio-max-batch", @@ -9117,7 +9171,7 @@ }, { "name": "server", - "type": "[365]" + "type": "[369]" }, { "name": "debug", @@ -9242,7 +9296,7 @@ "members": [ { "name": "transport", - "type": "467" + "type": "471" }, { "name": "portal", @@ -9275,7 +9329,7 @@ { "name": "header-digest", "default": null, - "type": "468" + "type": "472" }, { "name": "timeout", @@ -9290,7 +9344,7 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "key-secret", @@ -9305,7 +9359,7 @@ "members": [ { "name": "server", - "type": "365" + "type": "369" }, { "name": "export", @@ -9317,6 +9371,11 @@ "default": null, "type": "str" }, + { + "name": "tls-hostname", + "default": null, + "type": "str" + }, { "name": "x-dirty-bitmap", "default": null, @@ -9343,7 +9402,7 @@ "members": [ { "name": "server", - "type": "469" + "type": "473" }, { "name": "path", @@ -9422,7 +9481,7 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "prealloc-align", @@ -9442,12 +9501,12 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "backing", "default": null, - "type": "470" + "type": "474" }, { "name": "lazy-refcounts", @@ -9472,7 +9531,7 @@ { "name": "overlap-check", "default": null, - "type": "471" + "type": "475" }, { "name": "cache-size", @@ -9502,12 +9561,12 @@ { "name": "encrypt", "default": null, - "type": "472" + "type": "476" }, { "name": "data-file", "default": null, - "type": "462" + "type": "466" } ], "meta-type": "object" @@ -9517,17 +9576,17 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "backing", "default": null, - "type": "470" + "type": "474" }, { "name": "encrypt", "default": null, - "type": "473" + "type": "477" } ], "meta-type": "object" @@ -9537,12 +9596,12 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "backing", "default": null, - "type": "470" + "type": "474" } ], "meta-type": "object" @@ -9557,7 +9616,7 @@ }, { "name": "children", - "type": "[462]" + "type": "[466]" }, { "name": "vote-threshold", @@ -9571,7 +9630,7 @@ { "name": "read-pattern", "default": null, - "type": "474" + "type": "478" } ], "meta-type": "object" @@ -9581,7 +9640,7 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "offset", @@ -9625,7 +9684,7 @@ { "name": "encrypt", "default": null, - "type": "475" + "type": "479" }, { "name": "user", @@ -9635,7 +9694,7 @@ { "name": "auth-client-required", "default": null, - "type": "[476]" + "type": "[480]" }, { "name": "key-secret", @@ -9645,7 +9704,7 @@ { "name": "server", "default": null, - "type": "[477]" + "type": "[481]" } ], "meta-type": "object" @@ -9655,11 +9714,11 @@ "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "mode", - "type": "478" + "type": "482" }, { "name": "top-id", @@ -9674,7 +9733,7 @@ "members": [ { "name": "server", - "type": "479" + "type": "483" }, { "name": "path", @@ -9688,7 +9747,7 @@ { "name": "host-key-check", "default": null, - "type": "480" + "type": "484" } ], "meta-type": "object" @@ -9702,7 +9761,7 @@ }, { "name": "file", - "type": "462" + "type": "466" } ], "meta-type": "object" @@ -9748,188 +9807,59 @@ "variants": [ { "case": "file", - "type": "481" + "type": "485" }, { "case": "gluster", - "type": "482" + "type": "486" }, { "case": "luks", - "type": "483" + "type": "487" }, { "case": "nfs", - "type": "484" + "type": "488" }, { "case": "parallels", - "type": "485" + "type": "489" }, { "case": "qcow", - "type": "486" + "type": "490" }, { "case": "qcow2", - "type": "487" + "type": "491" }, { "case": "qed", - "type": "488" + "type": "492" }, { "case": "rbd", - "type": "489" + "type": "493" }, { "case": "ssh", - "type": "490" + "type": "494" }, { "case": "vdi", - "type": "491" + "type": "495" }, { "case": "vhdx", - "type": "492" + "type": "496" }, { "case": "vmdk", - "type": "493" + "type": "497" }, { "case": "vpc", - "type": "494" - }, - { - "case": "blkdebug", - "type": "0" - }, - { - "case": "blklogwrites", - "type": "0" - }, - { - "case": "blkreplay", - "type": "0" - }, - { - "case": "blkverify", - "type": "0" - }, - { - "case": "bochs", - "type": "0" - }, - { - "case": "cloop", - "type": "0" - }, - { - "case": "compress", - "type": "0" - }, - { - "case": "copy-before-write", - "type": "0" - }, - { - "case": "copy-on-read", - "type": "0" - }, - { - "case": "dmg", - "type": "0" - }, - { - "case": "ftp", - "type": "0" - }, - { - "case": "ftps", - "type": "0" - }, - { - "case": "host_cdrom", - "type": "0" - }, - { - "case": "host_device", - "type": "0" - }, - { - "case": "http", - "type": "0" - }, - { - "case": "https", - "type": "0" - }, - { - "case": "iscsi", - "type": "0" - }, - { - "case": "nbd", - "type": "0" - }, - { - "case": "null-aio", - "type": "0" - }, - { - "case": "null-co", - "type": "0" - }, - { - "case": "nvme", - "type": "0" - }, - { - "case": "preallocate", - "type": "0" - }, - { - "case": "quorum", - "type": "0" - }, - { - "case": "raw", - "type": "0" - }, - { - "case": "replication", - "type": "0" - }, - { - "case": "throttle", - "type": "0" - }, - { - "case": "vvfat", - "type": "0" - } - ], - "members": [ - { - "name": "driver", - "type": "270" - } - ], - "meta-type": "object" - }, - { - "name": "304", - "tag": "driver", - "variants": [ - { - "case": "luks", - "type": "495" - }, - { - "case": "qcow2", - "type": "496" + "type": "498" }, { "case": "blkdebug", @@ -9972,7 +9902,7 @@ "type": "0" }, { - "case": "file", + "case": "snapshot-access", "type": "0" }, { @@ -9983,10 +9913,147 @@ "case": "ftps", "type": "0" }, - { - "case": "gluster", - "type": "0" - }, + { + "case": "host_cdrom", + "type": "0" + }, + { + "case": "host_device", + "type": "0" + }, + { + "case": "http", + "type": "0" + }, + { + "case": "https", + "type": "0" + }, + { + "case": "iscsi", + "type": "0" + }, + { + "case": "nbd", + "type": "0" + }, + { + "case": "null-aio", + "type": "0" + }, + { + "case": "null-co", + "type": "0" + }, + { + "case": "nvme", + "type": "0" + }, + { + "case": "preallocate", + "type": "0" + }, + { + "case": "quorum", + "type": "0" + }, + { + "case": "raw", + "type": "0" + }, + { + "case": "replication", + "type": "0" + }, + { + "case": "throttle", + "type": "0" + }, + { + "case": "vvfat", + "type": "0" + } + ], + "members": [ + { + "name": "driver", + "type": "270" + } + ], + "meta-type": "object" + }, + { + "name": "304", + "tag": "driver", + "variants": [ + { + "case": "luks", + "type": "499" + }, + { + "case": "qcow2", + "type": "500" + }, + { + "case": "blkdebug", + "type": "0" + }, + { + "case": "blklogwrites", + "type": "0" + }, + { + "case": "blkreplay", + "type": "0" + }, + { + "case": "blkverify", + "type": "0" + }, + { + "case": "bochs", + "type": "0" + }, + { + "case": "cloop", + "type": "0" + }, + { + "case": "compress", + "type": "0" + }, + { + "case": "copy-before-write", + "type": "0" + }, + { + "case": "copy-on-read", + "type": "0" + }, + { + "case": "dmg", + "type": "0" + }, + { + "case": "file", + "type": "0" + }, + { + "case": "snapshot-access", + "type": "0" + }, + { + "case": "ftp", + "type": "0" + }, + { + "case": "ftps", + "type": "0" + }, + { + "case": "gluster", + "type": "0" + }, { "case": "host_cdrom", "type": "0" @@ -10214,25 +10281,25 @@ "variants": [ { "case": "inet", - "type": "498" + "type": "502" }, { "case": "unix", - "type": "499" + "type": "503" }, { "case": "vsock", - "type": "500" + "type": "504" }, { "case": "fd", - "type": "501" + "type": "505" } ], "members": [ { "name": "type", - "type": "497" + "type": "501" } ], "meta-type": "object" @@ -10261,12 +10328,16 @@ }, { "name": "vhost-user-blk" + }, + { + "name": "fuse" } ], "meta-type": "enum", "values": [ "nbd", - "vhost-user-blk" + "vhost-user-blk", + "fuse" ] }, { @@ -10300,7 +10371,7 @@ "members": [ { "name": "addr", - "type": "365" + "type": "369" }, { "name": "logical-block-size", @@ -10315,6 +10386,26 @@ ], "meta-type": "object" }, + { + "name": "315", + "members": [ + { + "name": "mountpoint", + "type": "str" + }, + { + "name": "growable", + "default": null, + "type": "bool" + }, + { + "name": "allow-other", + "default": null, + "type": "506" + } + ], + "meta-type": "object" + }, { "name": "316", "members": [ @@ -10337,97 +10428,97 @@ "variants": [ { "case": "file", - "type": "504" + "type": "508" }, { "case": "serial", - "type": "505" + "type": "509" }, { "case": "parallel", - "type": "505" + "type": "509" }, { "case": "pipe", - "type": "505" + "type": "509" }, { "case": "socket", - "type": "506" + "type": "510" }, { "case": "udp", - "type": "507" + "type": "511" }, { "case": "pty", - "type": "508" + "type": "512" }, { "case": "null", - "type": "508" + "type": "512" }, { "case": "mux", - "type": "509" + "type": "513" }, { "case": "msmouse", - "type": "508" + "type": "512" }, { "case": "wctablet", - "type": "508" + "type": "512" }, { "case": "braille", - "type": "508" + "type": "512" }, { "case": "testdev", - "type": "508" + "type": "512" }, { "case": "stdio", - "type": "510" + "type": "514" }, { "case": "console", - "type": "508" + "type": "512" }, { "case": "spicevmc", - "type": "511" + "type": "515" }, { "case": "spiceport", - "type": "512" + "type": "516" }, { "case": "qemu-vdagent", - "type": "513" + "type": "517" }, { "case": "dbus", - "type": "514" + "type": "518" }, { "case": "vc", - "type": "515" + "type": "519" }, { "case": "ringbuf", - "type": "516" + "type": "520" }, { "case": "memory", - "type": "516" + "type": "520" } ], "members": [ { "name": "type", - "type": "503" + "type": "507" } ], "meta-type": "object" @@ -10637,7 +10728,7 @@ { "name": "dnssearch", "default": null, - "type": "[517]" + "type": "[521]" }, { "name": "domainname", @@ -10677,12 +10768,12 @@ { "name": "hostfwd", "default": null, - "type": "[517]" + "type": "[521]" }, { "name": "guestfwd", "default": null, - "type": "[517]" + "type": "[521]" }, { "name": "tftp-server-name", @@ -11189,11 +11280,11 @@ "variants": [ { "case": "passthrough", - "type": "518" + "type": "522" }, { "case": "emulator", - "type": "519" + "type": "523" } ], "members": [ @@ -11206,6 +11297,64 @@ }, { "name": "339", + "members": [ + { + "name": "vnc" + }, + { + "name": "spice" + } + ], + "meta-type": "enum", + "values": [ + "vnc", + "spice" + ] + }, + { + "name": "340", + "members": [ + { + "name": "keep" + }, + { + "name": "fail" + }, + { + "name": "disconnect" + } + ], + "meta-type": "enum", + "values": [ + "keep", + "fail", + "disconnect" + ] + }, + { + "name": "341", + "members": [ + { + "name": "display", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "342", + "members": [ + { + "name": "display", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "343", "members": [ { "name": "client" @@ -11225,12 +11374,12 @@ ] }, { - "name": "[340]", - "element-type": "340", + "name": "[344]", + "element-type": "344", "meta-type": "array" }, { - "name": "340", + "name": "344", "members": [ { "name": "host", @@ -11242,7 +11391,7 @@ }, { "name": "family", - "type": "343" + "type": "347" }, { "name": "connection-id", @@ -11264,7 +11413,7 @@ "meta-type": "object" }, { - "name": "341", + "name": "345", "members": [ { "name": "host", @@ -11276,13 +11425,13 @@ }, { "name": "family", - "type": "343" + "type": "347" } ], "meta-type": "object" }, { - "name": "342", + "name": "346", "members": [ { "name": "host", @@ -11294,7 +11443,7 @@ }, { "name": "family", - "type": "343" + "type": "347" }, { "name": "auth", @@ -11305,7 +11454,7 @@ "meta-type": "object" }, { - "name": "343", + "name": "347", "members": [ { "name": "ipv4" @@ -11333,12 +11482,12 @@ ] }, { - "name": "[344]", - "element-type": "344", + "name": "[348]", + "element-type": "348", "meta-type": "array" }, { - "name": "344", + "name": "348", "members": [ { "name": "host", @@ -11350,7 +11499,7 @@ }, { "name": "family", - "type": "343" + "type": "347" }, { "name": "websocket", @@ -11370,12 +11519,12 @@ "meta-type": "object" }, { - "name": "[345]", - "element-type": "345", + "name": "[349]", + "element-type": "349", "meta-type": "array" }, { - "name": "345", + "name": "349", "members": [ { "name": "host", @@ -11387,7 +11536,7 @@ }, { "name": "family", - "type": "343" + "type": "347" }, { "name": "websocket", @@ -11395,18 +11544,18 @@ }, { "name": "auth", - "type": "346" + "type": "350" }, { "name": "vencrypt", "default": null, - "type": "347" + "type": "351" } ], "meta-type": "object" }, { - "name": "346", + "name": "350", "members": [ { "name": "none" @@ -11450,7 +11599,7 @@ ] }, { - "name": "347", + "name": "351", "members": [ { "name": "plain" @@ -11494,7 +11643,7 @@ ] }, { - "name": "348", + "name": "352", "members": [ { "name": "host", @@ -11506,7 +11655,7 @@ }, { "name": "family", - "type": "343" + "type": "347" }, { "name": "websocket", @@ -11521,7 +11670,7 @@ "meta-type": "object" }, { - "name": "349", + "name": "353", "members": [ { "name": "host", @@ -11533,7 +11682,7 @@ }, { "name": "family", - "type": "343" + "type": "347" }, { "name": "websocket", @@ -11543,67 +11692,67 @@ "meta-type": "object" }, { - "name": "[350]", - "element-type": "350", + "name": "[354]", + "element-type": "354", "meta-type": "array" }, { - "name": "350", + "name": "354", "tag": "type", "variants": [ { "case": "number", - "type": "521" + "type": "525" }, { "case": "qcode", - "type": "522" + "type": "526" } ], "members": [ { "name": "type", - "type": "520" + "type": "524" } ], "meta-type": "object" }, { - "name": "[351]", - "element-type": "351", + "name": "[355]", + "element-type": "355", "meta-type": "array" }, { - "name": "351", + "name": "355", "tag": "type", "variants": [ { "case": "key", - "type": "524" + "type": "528" }, { "case": "btn", - "type": "525" + "type": "529" }, { "case": "rel", - "type": "526" + "type": "530" }, { "case": "abs", - "type": "526" + "type": "530" } ], "members": [ { "name": "type", - "type": "523" + "type": "527" } ], "meta-type": "object" }, { - "name": "352", + "name": "356", "members": [ { "name": "default" @@ -11639,7 +11788,7 @@ ] }, { - "name": "353", + "name": "357", "members": [ { "name": "off" @@ -11663,7 +11812,7 @@ ] }, { - "name": "354", + "name": "358", "members": [ { "name": "grab-on-hover", @@ -11679,7 +11828,7 @@ "meta-type": "object" }, { - "name": "355", + "name": "359", "members": [ { "name": "charset", @@ -11690,7 +11839,7 @@ "meta-type": "object" }, { - "name": "356", + "name": "360", "members": [ { "name": "rendernode", @@ -11701,7 +11850,7 @@ "meta-type": "object" }, { - "name": "357", + "name": "361", "members": [ { "name": "rendernode", @@ -11727,7 +11876,7 @@ "meta-type": "object" }, { - "name": "358", + "name": "362", "members": [ { "name": "vnc" @@ -11739,7 +11888,7 @@ ] }, { - "name": "359", + "name": "363", "members": [ { "name": "tls-certs", @@ -11750,7 +11899,7 @@ "meta-type": "object" }, { - "name": "360", + "name": "364", "members": [ { "name": "none" @@ -11814,7 +11963,7 @@ ] }, { - "name": "361", + "name": "365", "members": [ { "name": "transferred", @@ -11871,12 +12020,24 @@ { "name": "pages-per-second", "type": "int" + }, + { + "name": "precopy-bytes", + "type": "int" + }, + { + "name": "downtime-bytes", + "type": "int" + }, + { + "name": "postcopy-bytes", + "type": "int" } ], "meta-type": "object" }, { - "name": "362", + "name": "366", "members": [ { "name": "transferred", @@ -11886,7 +12047,7 @@ "meta-type": "object" }, { - "name": "363", + "name": "367", "members": [ { "name": "cache-size", @@ -11920,7 +12081,7 @@ "meta-type": "object" }, { - "name": "364", + "name": "368", "members": [ { "name": "pages", @@ -11946,41 +12107,41 @@ "meta-type": "object" }, { - "name": "[365]", - "element-type": "365", + "name": "[369]", + "element-type": "369", "meta-type": "array" }, { - "name": "365", + "name": "369", "tag": "type", "variants": [ { "case": "inet", - "type": "479" + "type": "483" }, { "case": "unix", - "type": "527" + "type": "531" }, { "case": "vsock", - "type": "528" + "type": "532" }, { "case": "fd", - "type": "517" + "type": "521" } ], "members": [ { "name": "type", - "type": "497" + "type": "501" } ], "meta-type": "object" }, { - "name": "366", + "name": "370", "members": [ { "name": "xbzrle" @@ -12070,7 +12231,7 @@ ] }, { - "name": "367", + "name": "371", "members": [ { "name": "none" @@ -12090,12 +12251,12 @@ ] }, { - "name": "[368]", - "element-type": "368", + "name": "[372]", + "element-type": "372", "meta-type": "array" }, { - "name": "368", + "name": "372", "members": [ { "name": "node-name", @@ -12107,13 +12268,13 @@ }, { "name": "bitmaps", - "type": "[529]" + "type": "[533]" } ], "meta-type": "object" }, { - "name": "369", + "name": "373", "members": [ { "name": "none" @@ -12133,7 +12294,7 @@ ] }, { - "name": "370", + "name": "374", "members": [ { "name": "none" @@ -12157,7 +12318,7 @@ ] }, { - "name": "371", + "name": "375", "members": [ { "name": "page-sampling" @@ -12177,7 +12338,7 @@ ] }, { - "name": "372", + "name": "376", "members": [ { "name": "unstarted" @@ -12197,12 +12358,12 @@ ] }, { - "name": "[373]", - "element-type": "373", + "name": "[377]", + "element-type": "377", "meta-type": "array" }, { - "name": "373", + "name": "377", "members": [ { "name": "id", @@ -12216,84 +12377,84 @@ "meta-type": "object" }, { - "name": "[374]", - "element-type": "374", + "name": "[378]", + "element-type": "378", "meta-type": "array" }, { - "name": "374", + "name": "378", "tag": "type", "variants": [ { "case": "abort", - "type": "531" + "type": "535" }, { "case": "block-dirty-bitmap-add", - "type": "532" + "type": "536" }, { "case": "block-dirty-bitmap-remove", - "type": "533" + "type": "537" }, { "case": "block-dirty-bitmap-clear", - "type": "533" + "type": "537" }, { "case": "block-dirty-bitmap-enable", - "type": "533" + "type": "537" }, { "case": "block-dirty-bitmap-disable", - "type": "533" + "type": "537" }, { "case": "block-dirty-bitmap-merge", - "type": "534" + "type": "538" }, { "case": "blockdev-backup", - "type": "535" + "type": "539" }, { "case": "blockdev-snapshot", - "type": "536" + "type": "540" }, { "case": "blockdev-snapshot-internal-sync", - "type": "537" + "type": "541" }, { "case": "blockdev-snapshot-sync", - "type": "538" + "type": "542" }, { "case": "drive-backup", - "type": "539" + "type": "543" } ], "members": [ { "name": "type", - "type": "530" + "type": "534" } ], "meta-type": "object" }, { - "name": "375", + "name": "379", "members": [ { "name": "completion-mode", "default": null, - "type": "540" + "type": "544" } ], "meta-type": "object" }, { - "name": "376", + "name": "380", "members": [ { "name": "unavailable" @@ -12313,12 +12474,12 @@ ] }, { - "name": "[377]", - "element-type": "377", + "name": "[381]", + "element-type": "381", "meta-type": "array" }, { - "name": "377", + "name": "381", "members": [ { "name": "oob" @@ -12330,7 +12491,7 @@ ] }, { - "name": "378", + "name": "382", "members": [ { "name": "major", @@ -12348,7 +12509,7 @@ "meta-type": "object" }, { - "name": "379", + "name": "383", "members": [ { "name": "builtin" @@ -12384,21 +12545,21 @@ ] }, { - "name": "380", + "name": "384", "members": [ { "name": "json-type", - "type": "541" + "type": "545" } ], "meta-type": "object" }, { - "name": "381", + "name": "385", "members": [ { "name": "members", - "type": "[542]" + "type": "[546]" }, { "name": "values", @@ -12411,7 +12572,7 @@ "meta-type": "object" }, { - "name": "382", + "name": "386", "members": [ { "name": "element-type", @@ -12421,11 +12582,11 @@ "meta-type": "object" }, { - "name": "383", + "name": "387", "members": [ { "name": "members", - "type": "[543]" + "type": "[547]" }, { "name": "tag", @@ -12435,23 +12596,23 @@ { "name": "variants", "default": null, - "type": "[544]" + "type": "[548]" } ], "meta-type": "object" }, { - "name": "384", + "name": "388", "members": [ { "name": "members", - "type": "[545]" + "type": "[549]" } ], "meta-type": "object" }, { - "name": "385", + "name": "389", "members": [ { "name": "arg-type", @@ -12470,7 +12631,7 @@ "meta-type": "object" }, { - "name": "386", + "name": "390", "members": [ { "name": "arg-type", @@ -12480,7 +12641,7 @@ "meta-type": "object" }, { - "name": "387", + "name": "391", "members": [ { "name": "authz-list" @@ -12651,23 +12812,23 @@ ] }, { - "name": "388", + "name": "392", "members": [ { "name": "policy", "default": null, - "type": "546" + "type": "550" }, { "name": "rules", "default": null, - "type": "[547]" + "type": "[551]" } ], "meta-type": "object" }, { - "name": "389", + "name": "393", "members": [ { "name": "filename", @@ -12682,7 +12843,7 @@ "meta-type": "object" }, { - "name": "390", + "name": "394", "members": [ { "name": "service", @@ -12692,7 +12853,7 @@ "meta-type": "object" }, { - "name": "391", + "name": "395", "members": [ { "name": "identity", @@ -12702,7 +12863,7 @@ "meta-type": "object" }, { - "name": "392", + "name": "396", "members": [ { "name": "if", @@ -12716,7 +12877,7 @@ "meta-type": "object" }, { - "name": "393", + "name": "397", "members": [ { "name": "primary_in", @@ -12763,7 +12924,7 @@ "meta-type": "object" }, { - "name": "394", + "name": "398", "members": [ { "name": "queues", @@ -12774,7 +12935,7 @@ "meta-type": "object" }, { - "name": "395", + "name": "399", "members": [ { "name": "queues", @@ -12789,7 +12950,7 @@ "meta-type": "object" }, { - "name": "396", + "name": "400", "members": [ { "name": "addr", @@ -12804,7 +12965,7 @@ "meta-type": "object" }, { - "name": "397", + "name": "401", "members": [ { "name": "netdev", @@ -12813,7 +12974,7 @@ { "name": "queue", "default": null, - "type": "548" + "type": "552" }, { "name": "status", @@ -12828,7 +12989,7 @@ { "name": "insert", "default": null, - "type": "549" + "type": "553" }, { "name": "interval", @@ -12838,7 +12999,7 @@ "meta-type": "object" }, { - "name": "398", + "name": "402", "members": [ { "name": "netdev", @@ -12847,7 +13008,7 @@ { "name": "queue", "default": null, - "type": "548" + "type": "552" }, { "name": "status", @@ -12862,7 +13023,7 @@ { "name": "insert", "default": null, - "type": "549" + "type": "553" }, { "name": "file", @@ -12877,7 +13038,7 @@ "meta-type": "object" }, { - "name": "399", + "name": "403", "members": [ { "name": "netdev", @@ -12886,7 +13047,7 @@ { "name": "queue", "default": null, - "type": "548" + "type": "552" }, { "name": "status", @@ -12901,7 +13062,7 @@ { "name": "insert", "default": null, - "type": "549" + "type": "553" }, { "name": "outdev", @@ -12916,7 +13077,7 @@ "meta-type": "object" }, { - "name": "400", + "name": "404", "members": [ { "name": "netdev", @@ -12925,7 +13086,7 @@ { "name": "queue", "default": null, - "type": "548" + "type": "552" }, { "name": "status", @@ -12940,7 +13101,7 @@ { "name": "insert", "default": null, - "type": "549" + "type": "553" }, { "name": "indev", @@ -12961,7 +13122,7 @@ "meta-type": "object" }, { - "name": "401", + "name": "405", "members": [ { "name": "netdev", @@ -12970,7 +13131,7 @@ { "name": "queue", "default": null, - "type": "548" + "type": "552" }, { "name": "status", @@ -12985,13 +13146,13 @@ { "name": "insert", "default": null, - "type": "549" + "type": "553" } ], "meta-type": "object" }, { - "name": "402", + "name": "406", "members": [ { "name": "netdev", @@ -13000,7 +13161,7 @@ { "name": "queue", "default": null, - "type": "548" + "type": "552" }, { "name": "status", @@ -13015,7 +13176,7 @@ { "name": "insert", "default": null, - "type": "549" + "type": "553" }, { "name": "vnet_hdr_support", @@ -13026,7 +13187,7 @@ "meta-type": "object" }, { - "name": "403", + "name": "407", "members": [ { "name": "name", @@ -13066,7 +13227,7 @@ "meta-type": "object" }, { - "name": "404", + "name": "408", "members": [ { "name": "evdev", @@ -13085,13 +13246,13 @@ { "name": "grab-toggle", "default": null, - "type": "550" + "type": "554" } ], "meta-type": "object" }, { - "name": "405", + "name": "409", "members": [ { "name": "poll-max-ns", @@ -13117,7 +13278,7 @@ "meta-type": "object" }, { - "name": "406", + "name": "410", "members": [ { "name": "dump", @@ -13137,7 +13298,7 @@ { "name": "policy", "default": null, - "type": "427" + "type": "431" }, { "name": "prealloc", @@ -13172,7 +13333,7 @@ "meta-type": "object" }, { - "name": "407", + "name": "411", "members": [ { "name": "dump", @@ -13192,7 +13353,7 @@ { "name": "policy", "default": null, - "type": "427" + "type": "431" }, { "name": "prealloc", @@ -13251,7 +13412,7 @@ "meta-type": "object" }, { - "name": "408", + "name": "412", "members": [ { "name": "dump", @@ -13271,7 +13432,7 @@ { "name": "policy", "default": null, - "type": "427" + "type": "431" }, { "name": "prealloc", @@ -13321,7 +13482,7 @@ "meta-type": "object" }, { - "name": "409", + "name": "413", "members": [ { "name": "dump", @@ -13341,7 +13502,7 @@ { "name": "policy", "default": null, - "type": "427" + "type": "431" }, { "name": "prealloc", @@ -13376,7 +13537,7 @@ "meta-type": "object" }, { - "name": "410", + "name": "414", "members": [ { "name": "path", @@ -13386,7 +13547,7 @@ "meta-type": "object" }, { - "name": "411", + "name": "415", "members": [ { "name": "chardev", @@ -13401,7 +13562,7 @@ "meta-type": "object" }, { - "name": "412", + "name": "416", "members": [ { "name": "opened", @@ -13415,7 +13576,7 @@ "meta-type": "object" }, { - "name": "413", + "name": "417", "members": [ { "name": "opened", @@ -13433,7 +13594,7 @@ "meta-type": "object" }, { - "name": "414", + "name": "418", "members": [ { "name": "opened", @@ -13452,7 +13613,7 @@ "meta-type": "object" }, { - "name": "415", + "name": "419", "members": [ { "name": "loaded", @@ -13465,7 +13626,7 @@ { "name": "format", "default": null, - "type": "551" + "type": "555" }, { "name": "keyid", @@ -13491,7 +13652,7 @@ "meta-type": "object" }, { - "name": "416", + "name": "420", "members": [ { "name": "loaded", @@ -13504,7 +13665,7 @@ { "name": "format", "default": null, - "type": "551" + "type": "555" }, { "name": "keyid", @@ -13524,7 +13685,7 @@ "meta-type": "object" }, { - "name": "417", + "name": "421", "members": [ { "name": "sev-device", @@ -13569,12 +13730,12 @@ "meta-type": "object" }, { - "name": "418", + "name": "422", "members": [ { "name": "limits", "default": null, - "type": "552" + "type": "556" }, { "name": "x-iops-total", @@ -13732,7 +13893,7 @@ "meta-type": "object" }, { - "name": "419", + "name": "423", "members": [ { "name": "verify-peer", @@ -13747,7 +13908,7 @@ { "name": "endpoint", "default": null, - "type": "553" + "type": "557" }, { "name": "priority", @@ -13766,7 +13927,7 @@ "meta-type": "object" }, { - "name": "420", + "name": "424", "members": [ { "name": "verify-peer", @@ -13781,7 +13942,7 @@ { "name": "endpoint", "default": null, - "type": "553" + "type": "557" }, { "name": "priority", @@ -13805,7 +13966,7 @@ "meta-type": "object" }, { - "name": "421", + "name": "425", "members": [ { "name": "verify-peer", @@ -13820,7 +13981,7 @@ { "name": "endpoint", "default": null, - "type": "553" + "type": "557" }, { "name": "priority", @@ -13849,7 +14010,7 @@ "meta-type": "object" }, { - "name": "422", + "name": "426", "members": [ { "name": "verify-peer", @@ -13864,7 +14025,7 @@ { "name": "endpoint", "default": null, - "type": "553" + "type": "557" }, { "name": "priority", @@ -13875,7 +14036,7 @@ "meta-type": "object" }, { - "name": "423", + "name": "427", "members": [ { "name": "fd", @@ -13889,7 +14050,7 @@ "meta-type": "object" }, { - "name": "424", + "name": "428", "members": [ { "name": "node-id", @@ -13920,7 +14081,7 @@ "meta-type": "object" }, { - "name": "425", + "name": "429", "members": [ { "name": "aarch64" @@ -14048,17 +14209,17 @@ ] }, { - "name": "426", + "name": "430", "members": [ { "name": "cpu-state", - "type": "554" + "type": "558" } ], "meta-type": "object" }, { - "name": "427", + "name": "431", "members": [ { "name": "default" @@ -14082,7 +14243,7 @@ ] }, { - "name": "428", + "name": "432", "members": [ { "name": "node" @@ -14110,7 +14271,7 @@ ] }, { - "name": "429", + "name": "433", "members": [ { "name": "nodeid", @@ -14141,7 +14302,7 @@ "meta-type": "object" }, { - "name": "430", + "name": "434", "members": [ { "name": "src", @@ -14159,7 +14320,7 @@ "meta-type": "object" }, { - "name": "431", + "name": "435", "members": [ { "name": "node-id", @@ -14190,7 +14351,7 @@ "meta-type": "object" }, { - "name": "432", + "name": "436", "members": [ { "name": "initiator", @@ -14202,11 +14363,11 @@ }, { "name": "hierarchy", - "type": "555" + "type": "559" }, { "name": "data-type", - "type": "556" + "type": "560" }, { "name": "latency", @@ -14222,7 +14383,7 @@ "meta-type": "object" }, { - "name": "433", + "name": "437", "members": [ { "name": "node-id", @@ -14238,11 +14399,11 @@ }, { "name": "associativity", - "type": "557" + "type": "561" }, { "name": "policy", - "type": "558" + "type": "562" }, { "name": "line", @@ -14252,7 +14413,7 @@ "meta-type": "object" }, { - "name": "434", + "name": "438", "members": [ { "name": "dimm" @@ -14280,47 +14441,47 @@ ] }, { - "name": "435", + "name": "439", "members": [ { "name": "data", - "type": "559" + "type": "563" } ], "meta-type": "object" }, { - "name": "436", + "name": "440", "members": [ { "name": "data", - "type": "560" + "type": "564" } ], "meta-type": "object" }, { - "name": "437", + "name": "441", "members": [ { "name": "data", - "type": "561" + "type": "565" } ], "meta-type": "object" }, { - "name": "438", + "name": "442", "members": [ { "name": "data", - "type": "562" + "type": "566" } ], "meta-type": "object" }, { - "name": "439", + "name": "443", "members": [ { "name": "name", @@ -14335,7 +14496,7 @@ "meta-type": "object" }, { - "name": "440", + "name": "444", "members": [ { "name": "incompatible" @@ -14359,7 +14520,7 @@ ] }, { - "name": "441", + "name": "445", "members": [ { "name": "static" @@ -14375,7 +14536,7 @@ ] }, { - "name": "442", + "name": "446", "members": [ { "name": "none" @@ -14395,7 +14556,7 @@ ] }, { - "name": "443", + "name": "447", "members": [ { "name": "block-node" @@ -14415,7 +14576,7 @@ ] }, { - "name": "444", + "name": "448", "members": [ { "name": "node-name", @@ -14425,7 +14586,7 @@ "meta-type": "object" }, { - "name": "445", + "name": "449", "members": [ { "name": "id", @@ -14435,12 +14596,12 @@ "meta-type": "object" }, { - "name": "[446]", - "element-type": "446", + "name": "[450]", + "element-type": "450", "meta-type": "array" }, { - "name": "446", + "name": "450", "members": [ { "name": "fd", @@ -14455,12 +14616,12 @@ "meta-type": "object" }, { - "name": "[447]", - "element-type": "447", + "name": "[451]", + "element-type": "451", "meta-type": "array" }, { - "name": "447", + "name": "451", "members": [ { "name": "name", @@ -14468,7 +14629,7 @@ }, { "name": "type", - "type": "563" + "type": "567" }, { "name": "help", @@ -14484,7 +14645,7 @@ "meta-type": "object" }, { - "name": "448", + "name": "452", "members": [ { "name": "uninit" @@ -14516,12 +14677,12 @@ ] }, { - "name": "[449]", - "element-type": "449", + "name": "[453]", + "element-type": "453", "meta-type": "array" }, { - "name": "449", + "name": "453", "members": [ { "name": "node", @@ -14535,7 +14696,7 @@ "meta-type": "object" }, { - "name": "450", + "name": "454", "members": [ { "name": "DIMM" @@ -14551,12 +14712,12 @@ ] }, { - "name": "[451]", - "element-type": "451", + "name": "[455]", + "element-type": "455", "meta-type": "array" }, { - "name": "451", + "name": "455", "members": [ { "name": "bus", @@ -14572,11 +14733,11 @@ }, { "name": "class_info", - "type": "564" + "type": "568" }, { "name": "id", - "type": "565" + "type": "569" }, { "name": "irq", @@ -14594,17 +14755,17 @@ { "name": "pci_bridge", "default": null, - "type": "566" + "type": "570" }, { "name": "regions", - "type": "[567]" + "type": "[571]" } ], "meta-type": "object" }, { - "name": "452", + "name": "456", "members": [ { "name": "hyper-v" @@ -14620,7 +14781,7 @@ ] }, { - "name": "453", + "name": "457", "members": [ { "name": "arg1", @@ -14646,7 +14807,7 @@ "meta-type": "object" }, { - "name": "454", + "name": "458", "members": [ { "name": "core", @@ -14662,18 +14823,18 @@ }, { "name": "reason", - "type": "568" + "type": "572" } ], "meta-type": "object" }, { - "name": "[455]", - "element-type": "455", + "name": "[459]", + "element-type": "459", "meta-type": "array" }, { - "name": "455", + "name": "459", "members": [ { "name": "interval_length", @@ -14727,7 +14888,7 @@ "meta-type": "object" }, { - "name": "456", + "name": "460", "members": [ { "name": "boundaries", @@ -14741,7 +14902,7 @@ "meta-type": "object" }, { - "name": "457", + "name": "461", "members": [ { "name": "discard-nb-ok", @@ -14759,7 +14920,7 @@ "meta-type": "object" }, { - "name": "458", + "name": "462", "members": [ { "name": "completion-errors", @@ -14782,36 +14943,36 @@ "meta-type": "array" }, { - "name": "459", + "name": "463", "tag": "type", "variants": [ { "case": "qcow2", - "type": "570" + "type": "574" }, { "case": "vmdk", - "type": "571" + "type": "575" }, { "case": "luks", - "type": "572" + "type": "576" }, { "case": "rbd", - "type": "573" + "type": "577" } ], "members": [ { "name": "type", - "type": "569" + "type": "573" } ], "meta-type": "object" }, { - "name": "460", + "name": "464", "members": [ { "name": "block-backend" @@ -14831,12 +14992,12 @@ ] }, { - "name": "[461]", - "element-type": "461", + "name": "[465]", + "element-type": "465", "meta-type": "array" }, { - "name": "461", + "name": "465", "members": [ { "name": "consistent-read" @@ -14860,7 +15021,7 @@ ] }, { - "name": "462", + "name": "466", "members": [ { "type": "49" @@ -14872,16 +15033,16 @@ "meta-type": "alternate" }, { - "name": "[463]", - "element-type": "463", + "name": "[467]", + "element-type": "467", "meta-type": "array" }, { - "name": "463", + "name": "467", "members": [ { "name": "event", - "type": "574" + "type": "578" }, { "name": "state", @@ -14891,7 +15052,7 @@ { "name": "iotype", "default": null, - "type": "575" + "type": "579" }, { "name": "errno", @@ -14917,16 +15078,16 @@ "meta-type": "object" }, { - "name": "[464]", - "element-type": "464", + "name": "[468]", + "element-type": "468", "meta-type": "array" }, { - "name": "464", + "name": "468", "members": [ { "name": "event", - "type": "574" + "type": "578" }, { "name": "state", @@ -14941,7 +15102,7 @@ "meta-type": "object" }, { - "name": "465", + "name": "469", "members": [ { "name": "auto" @@ -14961,7 +15122,7 @@ ] }, { - "name": "466", + "name": "470", "members": [ { "name": "threads" @@ -14981,7 +15142,7 @@ ] }, { - "name": "467", + "name": "471", "members": [ { "name": "tcp" @@ -14997,7 +15158,7 @@ ] }, { - "name": "468", + "name": "472", "members": [ { "name": "crc32c" @@ -15021,11 +15182,11 @@ ] }, { - "name": "469", + "name": "473", "members": [ { "name": "type", - "type": "576" + "type": "580" }, { "name": "host", @@ -15035,7 +15196,7 @@ "meta-type": "object" }, { - "name": "470", + "name": "474", "members": [ { "type": "49" @@ -15050,62 +15211,62 @@ "meta-type": "alternate" }, { - "name": "471", + "name": "475", "members": [ { - "type": "577" + "type": "581" }, { - "type": "578" + "type": "582" } ], "meta-type": "alternate" }, { - "name": "472", + "name": "476", "tag": "format", "variants": [ { "case": "aes", - "type": "580" + "type": "584" }, { "case": "luks", - "type": "581" + "type": "585" } ], "members": [ { "name": "format", - "type": "579" + "type": "583" } ], "meta-type": "object" }, { - "name": "473", + "name": "477", "tag": "format", "variants": [ { "case": "aes", - "type": "580" + "type": "584" } ], "members": [ { "name": "format", - "type": "582" + "type": "586" } ], "meta-type": "object" }, { - "name": "[462]", - "element-type": "462", + "name": "[466]", + "element-type": "466", "meta-type": "array" }, { - "name": "474", + "name": "478", "members": [ { "name": "quorum" @@ -15121,33 +15282,33 @@ ] }, { - "name": "475", + "name": "479", "tag": "format", "variants": [ { "case": "luks", - "type": "584" + "type": "588" }, { "case": "luks2", - "type": "585" + "type": "589" } ], "members": [ { "name": "format", - "type": "583" + "type": "587" } ], "meta-type": "object" }, { - "name": "[476]", - "element-type": "476", + "name": "[480]", + "element-type": "480", "meta-type": "array" }, { - "name": "476", + "name": "480", "members": [ { "name": "cephx" @@ -15163,12 +15324,12 @@ ] }, { - "name": "[477]", - "element-type": "477", + "name": "[481]", + "element-type": "481", "meta-type": "array" }, { - "name": "477", + "name": "481", "members": [ { "name": "host", @@ -15182,7 +15343,7 @@ "meta-type": "object" }, { - "name": "478", + "name": "482", "members": [ { "name": "primary" @@ -15198,7 +15359,7 @@ ] }, { - "name": "479", + "name": "483", "members": [ { "name": "host", @@ -15242,12 +15403,12 @@ "meta-type": "object" }, { - "name": "480", + "name": "484", "tag": "mode", "variants": [ { "case": "hash", - "type": "587" + "type": "591" }, { "case": "none", @@ -15261,13 +15422,13 @@ "members": [ { "name": "mode", - "type": "586" + "type": "590" } ], "meta-type": "object" }, { - "name": "481", + "name": "485", "members": [ { "name": "filename", @@ -15280,7 +15441,7 @@ { "name": "preallocation", "default": null, - "type": "588" + "type": "592" }, { "name": "nocow", @@ -15296,7 +15457,7 @@ "meta-type": "object" }, { - "name": "482", + "name": "486", "members": [ { "name": "location", @@ -15309,13 +15470,13 @@ { "name": "preallocation", "default": null, - "type": "588" + "type": "592" } ], "meta-type": "object" }, { - "name": "483", + "name": "487", "members": [ { "name": "key-secret", @@ -15325,27 +15486,27 @@ { "name": "cipher-alg", "default": null, - "type": "589" + "type": "593" }, { "name": "cipher-mode", "default": null, - "type": "590" + "type": "594" }, { "name": "ivgen-alg", "default": null, - "type": "591" + "type": "595" }, { "name": "ivgen-hash-alg", "default": null, - "type": "592" + "type": "596" }, { "name": "hash-alg", "default": null, - "type": "592" + "type": "596" }, { "name": "iter-time", @@ -15354,7 +15515,7 @@ }, { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15363,13 +15524,13 @@ { "name": "preallocation", "default": null, - "type": "588" + "type": "592" } ], "meta-type": "object" }, { - "name": "484", + "name": "488", "members": [ { "name": "location", @@ -15383,11 +15544,11 @@ "meta-type": "object" }, { - "name": "485", + "name": "489", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15402,11 +15563,11 @@ "meta-type": "object" }, { - "name": "486", + "name": "490", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15420,22 +15581,22 @@ { "name": "encrypt", "default": null, - "type": "593" + "type": "597" } ], "meta-type": "object" }, { - "name": "487", + "name": "491", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "data-file", "default": null, - "type": "462" + "type": "466" }, { "name": "data-file-raw", @@ -15454,7 +15615,7 @@ { "name": "version", "default": null, - "type": "594" + "type": "598" }, { "name": "backing-file", @@ -15469,7 +15630,7 @@ { "name": "encrypt", "default": null, - "type": "593" + "type": "597" }, { "name": "cluster-size", @@ -15479,7 +15640,7 @@ { "name": "preallocation", "default": null, - "type": "588" + "type": "592" }, { "name": "lazy-refcounts", @@ -15494,17 +15655,17 @@ { "name": "compression-type", "default": null, - "type": "595" + "type": "599" } ], "meta-type": "object" }, { - "name": "488", + "name": "492", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15534,7 +15695,7 @@ "meta-type": "object" }, { - "name": "489", + "name": "493", "members": [ { "name": "location", @@ -15552,13 +15713,13 @@ { "name": "encrypt", "default": null, - "type": "596" + "type": "600" } ], "meta-type": "object" }, { - "name": "490", + "name": "494", "members": [ { "name": "location", @@ -15572,11 +15733,11 @@ "meta-type": "object" }, { - "name": "491", + "name": "495", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15585,17 +15746,17 @@ { "name": "preallocation", "default": null, - "type": "588" + "type": "592" } ], "meta-type": "object" }, { - "name": "492", + "name": "496", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15614,7 +15775,7 @@ { "name": "subformat", "default": null, - "type": "597" + "type": "601" }, { "name": "block-state-zero", @@ -15625,11 +15786,11 @@ "meta-type": "object" }, { - "name": "493", + "name": "497", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15638,12 +15799,12 @@ { "name": "extents", "default": null, - "type": "[462]" + "type": "[466]" }, { "name": "subformat", "default": null, - "type": "598" + "type": "602" }, { "name": "backing-file", @@ -15653,7 +15814,7 @@ { "name": "adapter-type", "default": null, - "type": "599" + "type": "603" }, { "name": "hwversion", @@ -15674,11 +15835,11 @@ "meta-type": "object" }, { - "name": "494", + "name": "498", "members": [ { "name": "file", - "type": "462" + "type": "466" }, { "name": "size", @@ -15687,7 +15848,7 @@ { "name": "subformat", "default": null, - "type": "600" + "type": "604" }, { "name": "force-size", @@ -15698,11 +15859,11 @@ "meta-type": "object" }, { - "name": "495", + "name": "499", "members": [ { "name": "state", - "type": "601" + "type": "605" }, { "name": "new-secret", @@ -15733,12 +15894,12 @@ "meta-type": "object" }, { - "name": "496", + "name": "500", "members": [ { "name": "encrypt", "default": null, - "type": "602" + "type": "606" } ], "meta-type": "object" @@ -15749,7 +15910,7 @@ "meta-type": "builtin" }, { - "name": "497", + "name": "501", "members": [ { "name": "inet" @@ -15773,47 +15934,47 @@ ] }, { - "name": "498", + "name": "502", "members": [ { "name": "data", - "type": "479" + "type": "483" } ], "meta-type": "object" }, { - "name": "499", + "name": "503", "members": [ { "name": "data", - "type": "527" + "type": "531" } ], "meta-type": "object" }, { - "name": "500", + "name": "504", "members": [ { "name": "data", - "type": "528" + "type": "532" } ], "meta-type": "object" }, { - "name": "501", + "name": "505", "members": [ { "name": "data", - "type": "517" + "type": "521" } ], "meta-type": "object" }, { - "name": "502", + "name": "506", "members": [ { "name": "off" @@ -15833,7 +15994,7 @@ ] }, { - "name": "503", + "name": "507", "members": [ { "name": "file" @@ -15929,142 +16090,142 @@ ] }, { - "name": "504", + "name": "508", "members": [ { "name": "data", - "type": "603" + "type": "607" } ], "meta-type": "object" }, { - "name": "505", + "name": "509", "members": [ { "name": "data", - "type": "604" + "type": "608" } ], "meta-type": "object" }, { - "name": "506", + "name": "510", "members": [ { "name": "data", - "type": "605" + "type": "609" } ], "meta-type": "object" }, { - "name": "507", + "name": "511", "members": [ { "name": "data", - "type": "606" + "type": "610" } ], "meta-type": "object" }, { - "name": "508", + "name": "512", "members": [ { "name": "data", - "type": "607" + "type": "611" } ], "meta-type": "object" }, { - "name": "509", + "name": "513", "members": [ { "name": "data", - "type": "608" + "type": "612" } ], "meta-type": "object" }, { - "name": "510", + "name": "514", "members": [ { "name": "data", - "type": "609" + "type": "613" } ], "meta-type": "object" }, { - "name": "511", + "name": "515", "members": [ { "name": "data", - "type": "610" + "type": "614" } ], "meta-type": "object" }, { - "name": "512", + "name": "516", "members": [ { "name": "data", - "type": "611" + "type": "615" } ], "meta-type": "object" }, { - "name": "513", + "name": "517", "members": [ { "name": "data", - "type": "612" + "type": "616" } ], "meta-type": "object" }, { - "name": "514", + "name": "518", "members": [ { "name": "data", - "type": "613" + "type": "617" } ], "meta-type": "object" }, { - "name": "515", + "name": "519", "members": [ { "name": "data", - "type": "614" + "type": "618" } ], "meta-type": "object" }, { - "name": "516", + "name": "520", "members": [ { "name": "data", - "type": "615" + "type": "619" } ], "meta-type": "object" }, { - "name": "[517]", - "element-type": "517", + "name": "[521]", + "element-type": "521", "meta-type": "array" }, { - "name": "517", + "name": "521", "members": [ { "name": "str", @@ -16074,27 +16235,27 @@ "meta-type": "object" }, { - "name": "518", + "name": "522", "members": [ { "name": "data", - "type": "616" + "type": "620" } ], "meta-type": "object" }, { - "name": "519", + "name": "523", "members": [ { "name": "data", - "type": "617" + "type": "621" } ], "meta-type": "object" }, { - "name": "520", + "name": "524", "members": [ { "name": "number" @@ -16110,7 +16271,7 @@ ] }, { - "name": "521", + "name": "525", "members": [ { "name": "data", @@ -16120,17 +16281,17 @@ "meta-type": "object" }, { - "name": "522", + "name": "526", "members": [ { "name": "data", - "type": "618" + "type": "622" } ], "meta-type": "object" }, { - "name": "523", + "name": "527", "members": [ { "name": "key" @@ -16154,31 +16315,31 @@ ] }, { - "name": "524", + "name": "528", "members": [ { "name": "data", - "type": "619" + "type": "623" } ], "meta-type": "object" }, { - "name": "525", + "name": "529", "members": [ { "name": "data", - "type": "620" + "type": "624" } ], "meta-type": "object" }, { - "name": "526", + "name": "530", "members": [ { "name": "data", - "type": "621" + "type": "625" } ], "meta-type": "object" @@ -16189,7 +16350,7 @@ "meta-type": "builtin" }, { - "name": "527", + "name": "531", "members": [ { "name": "path", @@ -16209,7 +16370,7 @@ "meta-type": "object" }, { - "name": "528", + "name": "532", "members": [ { "name": "cid", @@ -16223,12 +16384,12 @@ "meta-type": "object" }, { - "name": "[529]", - "element-type": "529", + "name": "[533]", + "element-type": "533", "meta-type": "array" }, { - "name": "529", + "name": "533", "members": [ { "name": "name", @@ -16241,13 +16402,13 @@ { "name": "transform", "default": null, - "type": "622" + "type": "626" } ], "meta-type": "object" }, { - "name": "530", + "name": "534", "members": [ { "name": "abort" @@ -16306,17 +16467,17 @@ ] }, { - "name": "531", + "name": "535", "members": [ { "name": "data", - "type": "623" + "type": "627" } ], "meta-type": "object" }, { - "name": "532", + "name": "536", "members": [ { "name": "data", @@ -16326,7 +16487,7 @@ "meta-type": "object" }, { - "name": "533", + "name": "537", "members": [ { "name": "data", @@ -16336,7 +16497,7 @@ "meta-type": "object" }, { - "name": "534", + "name": "538", "members": [ { "name": "data", @@ -16346,7 +16507,7 @@ "meta-type": "object" }, { - "name": "535", + "name": "539", "members": [ { "name": "data", @@ -16356,7 +16517,7 @@ "meta-type": "object" }, { - "name": "536", + "name": "540", "members": [ { "name": "data", @@ -16366,7 +16527,7 @@ "meta-type": "object" }, { - "name": "537", + "name": "541", "members": [ { "name": "data", @@ -16376,7 +16537,7 @@ "meta-type": "object" }, { - "name": "538", + "name": "542", "members": [ { "name": "data", @@ -16386,7 +16547,7 @@ "meta-type": "object" }, { - "name": "539", + "name": "543", "members": [ { "name": "data", @@ -16396,7 +16557,7 @@ "meta-type": "object" }, { - "name": "540", + "name": "544", "members": [ { "name": "individual" @@ -16412,7 +16573,7 @@ ] }, { - "name": "541", + "name": "545", "members": [ { "name": "string" @@ -16452,12 +16613,12 @@ ] }, { - "name": "[542]", - "element-type": "542", + "name": "[546]", + "element-type": "546", "meta-type": "array" }, { - "name": "542", + "name": "546", "members": [ { "name": "name", @@ -16472,12 +16633,12 @@ "meta-type": "object" }, { - "name": "[543]", - "element-type": "543", + "name": "[547]", + "element-type": "547", "meta-type": "array" }, { - "name": "543", + "name": "547", "members": [ { "name": "name", @@ -16501,12 +16662,12 @@ "meta-type": "object" }, { - "name": "[544]", - "element-type": "544", + "name": "[548]", + "element-type": "548", "meta-type": "array" }, { - "name": "544", + "name": "548", "members": [ { "name": "case", @@ -16520,12 +16681,12 @@ "meta-type": "object" }, { - "name": "[545]", - "element-type": "545", + "name": "[549]", + "element-type": "549", "meta-type": "array" }, { - "name": "545", + "name": "549", "members": [ { "name": "type", @@ -16535,7 +16696,7 @@ "meta-type": "object" }, { - "name": "546", + "name": "550", "members": [ { "name": "deny" @@ -16551,12 +16712,12 @@ ] }, { - "name": "[547]", - "element-type": "547", + "name": "[551]", + "element-type": "551", "meta-type": "array" }, { - "name": "547", + "name": "551", "members": [ { "name": "match", @@ -16564,18 +16725,18 @@ }, { "name": "policy", - "type": "546" + "type": "550" }, { "name": "format", "default": null, - "type": "624" + "type": "628" } ], "meta-type": "object" }, { - "name": "548", + "name": "552", "members": [ { "name": "all" @@ -16595,7 +16756,7 @@ ] }, { - "name": "549", + "name": "553", "members": [ { "name": "before" @@ -16611,7 +16772,7 @@ ] }, { - "name": "550", + "name": "554", "members": [ { "name": "ctrl-ctrl" @@ -16643,7 +16804,7 @@ ] }, { - "name": "551", + "name": "555", "members": [ { "name": "raw" @@ -16659,7 +16820,7 @@ ] }, { - "name": "552", + "name": "556", "members": [ { "name": "iops-total", @@ -16760,7 +16921,7 @@ "meta-type": "object" }, { - "name": "553", + "name": "557", "members": [ { "name": "client" @@ -16776,7 +16937,7 @@ ] }, { - "name": "554", + "name": "558", "members": [ { "name": "uninitialized" @@ -16804,7 +16965,7 @@ ] }, { - "name": "555", + "name": "559", "members": [ { "name": "memory" @@ -16828,7 +16989,7 @@ ] }, { - "name": "556", + "name": "560", "members": [ { "name": "access-latency" @@ -16860,7 +17021,7 @@ ] }, { - "name": "557", + "name": "561", "members": [ { "name": "none" @@ -16880,7 +17041,7 @@ ] }, { - "name": "558", + "name": "562", "members": [ { "name": "none" @@ -16900,7 +17061,7 @@ ] }, { - "name": "559", + "name": "563", "members": [ { "name": "id", @@ -16939,7 +17100,7 @@ "meta-type": "object" }, { - "name": "560", + "name": "564", "members": [ { "name": "id", @@ -16962,7 +17123,7 @@ "meta-type": "object" }, { - "name": "561", + "name": "565", "members": [ { "name": "id", @@ -17001,7 +17162,7 @@ "meta-type": "object" }, { - "name": "562", + "name": "566", "members": [ { "name": "id", @@ -17028,7 +17189,7 @@ "meta-type": "object" }, { - "name": "563", + "name": "567", "members": [ { "name": "string" @@ -17052,7 +17213,7 @@ ] }, { - "name": "564", + "name": "568", "members": [ { "name": "desc", @@ -17067,7 +17228,7 @@ "meta-type": "object" }, { - "name": "565", + "name": "569", "members": [ { "name": "device", @@ -17091,27 +17252,27 @@ "meta-type": "object" }, { - "name": "566", + "name": "570", "members": [ { "name": "bus", - "type": "625" + "type": "629" }, { "name": "devices", "default": null, - "type": "[451]" + "type": "[455]" } ], "meta-type": "object" }, { - "name": "[567]", - "element-type": "567", + "name": "[571]", + "element-type": "571", "meta-type": "array" }, { - "name": "567", + "name": "571", "members": [ { "name": "bar", @@ -17143,7 +17304,7 @@ "meta-type": "object" }, { - "name": "568", + "name": "572", "members": [ { "name": "unknown" @@ -17171,7 +17332,7 @@ ] }, { - "name": "569", + "name": "573", "members": [ { "name": "qcow2" @@ -17195,47 +17356,47 @@ ] }, { - "name": "570", + "name": "574", "members": [ { "name": "data", - "type": "626" + "type": "630" } ], "meta-type": "object" }, { - "name": "571", + "name": "575", "members": [ { "name": "data", - "type": "627" + "type": "631" } ], "meta-type": "object" }, { - "name": "572", + "name": "576", "members": [ { "name": "data", - "type": "628" + "type": "632" } ], "meta-type": "object" }, { - "name": "573", + "name": "577", "members": [ { "name": "data", - "type": "629" + "type": "633" } ], "meta-type": "object" }, { - "name": "574", + "name": "578", "members": [ { "name": "l1_update" @@ -17435,7 +17596,7 @@ ] }, { - "name": "575", + "name": "579", "members": [ { "name": "read" @@ -17467,7 +17628,7 @@ ] }, { - "name": "576", + "name": "580", "members": [ { "name": "inet" @@ -17479,12 +17640,12 @@ ] }, { - "name": "577", + "name": "581", "members": [ { "name": "template", "default": null, - "type": "578" + "type": "582" }, { "name": "main-header", @@ -17535,7 +17696,7 @@ "meta-type": "object" }, { - "name": "578", + "name": "582", "members": [ { "name": "none" @@ -17559,7 +17720,7 @@ ] }, { - "name": "579", + "name": "583", "members": [ { "name": "aes" @@ -17575,7 +17736,7 @@ ] }, { - "name": "580", + "name": "584", "members": [ { "name": "key-secret", @@ -17586,7 +17747,7 @@ "meta-type": "object" }, { - "name": "581", + "name": "585", "members": [ { "name": "key-secret", @@ -17597,7 +17758,7 @@ "meta-type": "object" }, { - "name": "582", + "name": "586", "members": [ { "name": "aes" @@ -17609,7 +17770,7 @@ ] }, { - "name": "583", + "name": "587", "members": [ { "name": "luks" @@ -17625,7 +17786,7 @@ ] }, { - "name": "584", + "name": "588", "members": [ { "name": "key-secret", @@ -17635,7 +17796,7 @@ "meta-type": "object" }, { - "name": "585", + "name": "589", "members": [ { "name": "key-secret", @@ -17645,7 +17806,7 @@ "meta-type": "object" }, { - "name": "586", + "name": "590", "members": [ { "name": "none" @@ -17665,11 +17826,11 @@ ] }, { - "name": "587", + "name": "591", "members": [ { "name": "type", - "type": "630" + "type": "634" }, { "name": "hash", @@ -17679,7 +17840,7 @@ "meta-type": "object" }, { - "name": "588", + "name": "592", "members": [ { "name": "off" @@ -17703,7 +17864,7 @@ ] }, { - "name": "589", + "name": "593", "members": [ { "name": "aes-128" @@ -17759,7 +17920,7 @@ ] }, { - "name": "590", + "name": "594", "members": [ { "name": "ecb" @@ -17783,7 +17944,7 @@ ] }, { - "name": "591", + "name": "595", "members": [ { "name": "plain" @@ -17803,7 +17964,7 @@ ] }, { - "name": "592", + "name": "596", "members": [ { "name": "md5" @@ -17839,28 +18000,28 @@ ] }, { - "name": "593", + "name": "597", "tag": "format", "variants": [ { "case": "qcow", - "type": "580" + "type": "584" }, { "case": "luks", - "type": "632" + "type": "636" } ], "members": [ { "name": "format", - "type": "631" + "type": "635" } ], "meta-type": "object" }, { - "name": "594", + "name": "598", "members": [ { "name": "v2" @@ -17876,7 +18037,7 @@ ] }, { - "name": "595", + "name": "599", "members": [ { "name": "zlib" @@ -17892,28 +18053,28 @@ ] }, { - "name": "596", + "name": "600", "tag": "format", "variants": [ { "case": "luks", - "type": "633" + "type": "637" }, { "case": "luks2", - "type": "634" + "type": "638" } ], "members": [ { "name": "format", - "type": "583" + "type": "587" } ], "meta-type": "object" }, { - "name": "597", + "name": "601", "members": [ { "name": "dynamic" @@ -17929,7 +18090,7 @@ ] }, { - "name": "598", + "name": "602", "members": [ { "name": "monolithicSparse" @@ -17957,7 +18118,7 @@ ] }, { - "name": "599", + "name": "603", "members": [ { "name": "ide" @@ -17981,7 +18142,7 @@ ] }, { - "name": "600", + "name": "604", "members": [ { "name": "dynamic" @@ -17997,7 +18158,7 @@ ] }, { - "name": "601", + "name": "605", "members": [ { "name": "active" @@ -18013,12 +18174,12 @@ ] }, { - "name": "602", + "name": "606", "tag": "format", "variants": [ { "case": "luks", - "type": "635" + "type": "639" }, { "case": "qcow", @@ -18028,13 +18189,13 @@ "members": [ { "name": "format", - "type": "631" + "type": "635" } ], "meta-type": "object" }, { - "name": "603", + "name": "607", "members": [ { "name": "logfile", @@ -18064,7 +18225,7 @@ "meta-type": "object" }, { - "name": "604", + "name": "608", "members": [ { "name": "logfile", @@ -18084,7 +18245,7 @@ "meta-type": "object" }, { - "name": "605", + "name": "609", "members": [ { "name": "logfile", @@ -18149,7 +18310,7 @@ "meta-type": "object" }, { - "name": "606", + "name": "610", "members": [ { "name": "logfile", @@ -18174,7 +18335,7 @@ "meta-type": "object" }, { - "name": "607", + "name": "611", "members": [ { "name": "logfile", @@ -18190,7 +18351,7 @@ "meta-type": "object" }, { - "name": "608", + "name": "612", "members": [ { "name": "logfile", @@ -18210,7 +18371,7 @@ "meta-type": "object" }, { - "name": "609", + "name": "613", "members": [ { "name": "logfile", @@ -18231,7 +18392,7 @@ "meta-type": "object" }, { - "name": "610", + "name": "614", "members": [ { "name": "logfile", @@ -18251,7 +18412,7 @@ "meta-type": "object" }, { - "name": "611", + "name": "615", "members": [ { "name": "logfile", @@ -18271,7 +18432,7 @@ "meta-type": "object" }, { - "name": "612", + "name": "616", "members": [ { "name": "logfile", @@ -18297,7 +18458,7 @@ "meta-type": "object" }, { - "name": "613", + "name": "617", "members": [ { "name": "logfile", @@ -18317,7 +18478,7 @@ "meta-type": "object" }, { - "name": "614", + "name": "618", "members": [ { "name": "logfile", @@ -18353,7 +18514,7 @@ "meta-type": "object" }, { - "name": "615", + "name": "619", "members": [ { "name": "logfile", @@ -18374,7 +18535,7 @@ "meta-type": "object" }, { - "name": "616", + "name": "620", "members": [ { "name": "path", @@ -18390,7 +18551,7 @@ "meta-type": "object" }, { - "name": "617", + "name": "621", "members": [ { "name": "chardev", @@ -18400,7 +18561,7 @@ "meta-type": "object" }, { - "name": "618", + "name": "622", "members": [ { "name": "unmapped" @@ -19008,11 +19169,11 @@ ] }, { - "name": "619", + "name": "623", "members": [ { "name": "key", - "type": "350" + "type": "354" }, { "name": "down", @@ -19022,11 +19183,11 @@ "meta-type": "object" }, { - "name": "620", + "name": "624", "members": [ { "name": "button", - "type": "636" + "type": "640" }, { "name": "down", @@ -19036,11 +19197,11 @@ "meta-type": "object" }, { - "name": "621", + "name": "625", "members": [ { "name": "axis", - "type": "637" + "type": "641" }, { "name": "value", @@ -19050,7 +19211,7 @@ "meta-type": "object" }, { - "name": "622", + "name": "626", "members": [ { "name": "persistent", @@ -19061,13 +19222,13 @@ "meta-type": "object" }, { - "name": "623", + "name": "627", "members": [ ], "meta-type": "object" }, { - "name": "624", + "name": "628", "members": [ { "name": "exact" @@ -19083,7 +19244,7 @@ ] }, { - "name": "625", + "name": "629", "members": [ { "name": "number", @@ -19099,21 +19260,21 @@ }, { "name": "io_range", - "type": "638" + "type": "642" }, { "name": "memory_range", - "type": "638" + "type": "642" }, { "name": "prefetchable_range", - "type": "638" + "type": "642" } ], "meta-type": "object" }, { - "name": "626", + "name": "630", "members": [ { "name": "compat", @@ -19151,22 +19312,22 @@ { "name": "encrypt", "default": null, - "type": "639" + "type": "643" }, { "name": "bitmaps", "default": null, - "type": "[640]" + "type": "[644]" }, { "name": "compression-type", - "type": "595" + "type": "599" } ], "meta-type": "object" }, { - "name": "627", + "name": "631", "members": [ { "name": "create-type", @@ -19188,28 +19349,28 @@ "meta-type": "object" }, { - "name": "628", + "name": "632", "members": [ { "name": "cipher-alg", - "type": "589" + "type": "593" }, { "name": "cipher-mode", - "type": "590" + "type": "594" }, { "name": "ivgen-alg", - "type": "591" + "type": "595" }, { "name": "ivgen-hash-alg", "default": null, - "type": "592" + "type": "596" }, { "name": "hash-alg", - "type": "592" + "type": "596" }, { "name": "payload-offset", @@ -19225,24 +19386,24 @@ }, { "name": "slots", - "type": "[641]" + "type": "[645]" } ], "meta-type": "object" }, { - "name": "629", + "name": "633", "members": [ { "name": "encryption-format", "default": null, - "type": "583" + "type": "587" } ], "meta-type": "object" }, { - "name": "630", + "name": "634", "members": [ { "name": "md5" @@ -19262,7 +19423,7 @@ ] }, { - "name": "631", + "name": "635", "members": [ { "name": "qcow" @@ -19278,7 +19439,7 @@ ] }, { - "name": "632", + "name": "636", "members": [ { "name": "key-secret", @@ -19288,27 +19449,27 @@ { "name": "cipher-alg", "default": null, - "type": "589" + "type": "593" }, { "name": "cipher-mode", "default": null, - "type": "590" + "type": "594" }, { "name": "ivgen-alg", "default": null, - "type": "591" + "type": "595" }, { "name": "ivgen-hash-alg", "default": null, - "type": "592" + "type": "596" }, { "name": "hash-alg", "default": null, - "type": "592" + "type": "596" }, { "name": "iter-time", @@ -19319,7 +19480,7 @@ "meta-type": "object" }, { - "name": "633", + "name": "637", "members": [ { "name": "key-secret", @@ -19328,13 +19489,13 @@ { "name": "cipher-alg", "default": null, - "type": "589" + "type": "593" } ], "meta-type": "object" }, { - "name": "634", + "name": "638", "members": [ { "name": "key-secret", @@ -19343,17 +19504,17 @@ { "name": "cipher-alg", "default": null, - "type": "589" + "type": "593" } ], "meta-type": "object" }, { - "name": "635", + "name": "639", "members": [ { "name": "state", - "type": "601" + "type": "605" }, { "name": "new-secret", @@ -19384,7 +19545,7 @@ "meta-type": "object" }, { - "name": "636", + "name": "640", "members": [ { "name": "left" @@ -19428,7 +19589,7 @@ ] }, { - "name": "637", + "name": "641", "members": [ { "name": "x" @@ -19444,7 +19605,7 @@ ] }, { - "name": "638", + "name": "642", "members": [ { "name": "base", @@ -19458,12 +19619,12 @@ "meta-type": "object" }, { - "name": "639", + "name": "643", "tag": "format", "variants": [ { "case": "luks", - "type": "628" + "type": "632" }, { "case": "aes", @@ -19473,18 +19634,18 @@ "members": [ { "name": "format", - "type": "579" + "type": "583" } ], "meta-type": "object" }, { - "name": "[640]", - "element-type": "640", + "name": "[644]", + "element-type": "644", "meta-type": "array" }, { - "name": "640", + "name": "644", "members": [ { "name": "name", @@ -19496,7 +19657,7 @@ }, { "name": "flags", - "type": "[642]" + "type": "[646]" } ], "meta-type": "object" @@ -19507,12 +19668,12 @@ "meta-type": "array" }, { - "name": "[641]", - "element-type": "641", + "name": "[645]", + "element-type": "645", "meta-type": "array" }, { - "name": "641", + "name": "645", "members": [ { "name": "active", @@ -19536,12 +19697,12 @@ "meta-type": "object" }, { - "name": "[642]", - "element-type": "642", + "name": "[646]", + "element-type": "646", "meta-type": "array" }, { - "name": "642", + "name": "646", "members": [ { "name": "in-use" @@ -20215,6 +20376,10 @@ "name": "pc-q35-2.11-machine", "parent": "generic-pc-machine" }, + { + "name": "acpi-erst", + "parent": "pci-device" + }, { "name": "isa-applesmc", "parent": "isa-device" @@ -20899,14 +21064,14 @@ "name": "IvyBridge-v2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "ne2k_pci", - "parent": "pci-device" - }, { "name": "isabus-bridge", "parent": "sys-bus-device" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -20968,7 +21133,7 @@ "parent": "isa-device" }, { - "name": "Conroe-v1-x86_64-cpu", + "name": "Icelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21008,12 +21173,12 @@ "parent": "pci-xhci" }, { - "name": "kvm-apic", - "parent": "apic-common" + "name": "Conroe-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Icelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "kvm-apic", + "parent": "apic-common" }, { "name": "isa-pit", @@ -21583,10 +21748,6 @@ "name": "qemu-console", "parent": "object" }, - { - "name": "chardev-socket", - "parent": "chardev" - }, { "name": "clock", "parent": "object" @@ -21624,8 +21785,12 @@ "parent": "device" }, { - "name": "virtio-pmem", - "parent": "virtio-device" + "name": "Cascadelake-Server-noTSX-x86_64-cpu", + "parent": "x86_64-cpu" + }, + { + "name": "chardev-socket", + "parent": "chardev" }, { "name": "nvme-bus", @@ -21651,14 +21816,14 @@ "name": "scsi-hd", "parent": "scsi-disk-base" }, - { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-kbd", "parent": "usb-hid" }, + { + "name": "lsi53c810", + "parent": "lsi53c895a" + }, { "name": "isa-fdc", "parent": "isa-device" @@ -21692,8 +21857,8 @@ "parent": "generic-pc-machine" }, { - "name": "Skylake-Client-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-pmem", + "parent": "virtio-device" }, { "name": "tpm-tis", @@ -21740,8 +21905,8 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "Skylake-Client-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ioh3420", @@ -21967,14 +22132,14 @@ "name": "Skylake-Server-v4-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "kvmvapic", - "parent": "sys-bus-device" - }, { "name": "Nehalem-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "kvmvapic", + "parent": "sys-bus-device" + }, { "name": "nvme-ns", "parent": "device" @@ -22204,8 +22369,8 @@ "parent": "chardev" }, { - "name": "isa-parallel", - "parent": "isa-device" + "name": "Cooperlake-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Skylake-Server-x86_64-cpu", @@ -22216,8 +22381,8 @@ "parent": "generic-pc-machine" }, { - "name": "Cooperlake-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "isa-parallel", + "parent": "isa-device" }, { "name": "pentium2-v1-x86_64-cpu", @@ -26029,24 +26194,14 @@ "description": "on/off/auto", "type": "OnOffAuto" }, - { - "default-value": true, - "name": "dma-drain", - "type": "bool" - }, { "default-value": false, - "name": "caching-mode", - "type": "bool" - }, - { - "default-value": false, - "name": "x-buggy-eim", + "name": "x-scalable-mode", "type": "bool" }, { "default-value": false, - "name": "x-scalable-mode", + "name": "caching-mode", "type": "bool" }, { @@ -26064,6 +26219,21 @@ "default-value": 0, "name": "version", "type": "uint32" + }, + { + "default-value": false, + "name": "x-buggy-eim", + "type": "bool" + }, + { + "default-value": true, + "name": "dma-drain", + "type": "bool" + }, + { + "default-value": false, + "name": "snoop-control", + "type": "bool" } ], "id": "libvirt-32" @@ -28769,7 +28939,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -28856,7 +29026,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -28955,7 +29125,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -29048,7 +29218,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -33857,7 +34027,6 @@ "tsc-deadline", "rdseed", "sha-ni", - "umip", "gfni", "cldemote", "movdiri", @@ -33881,7 +34050,6 @@ "tsc-deadline", "rdseed", "sha-ni", - "umip", "gfni", "cldemote", "movdiri", @@ -33907,7 +34075,6 @@ "tsc-deadline", "rdseed", "sha-ni", - "umip", "gfni", "cldemote", "movdiri", @@ -33932,7 +34099,6 @@ "tsc-deadline", "rdseed", "sha-ni", - "umip", "gfni", "cldemote", "movdiri", @@ -33957,7 +34123,6 @@ "tsc-deadline", "rdseed", "sha-ni", - "umip", "gfni", "cldemote", "movdiri", @@ -34714,7 +34879,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -34763,7 +34927,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -34809,7 +34972,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -34853,7 +35015,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -34892,7 +35053,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -34929,7 +35089,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -34969,7 +35128,6 @@ "avx512bw", "avx512vl", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -35002,7 +35160,6 @@ "invpcid", "rdseed", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -35035,7 +35192,6 @@ "invpcid", "rdseed", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -35069,7 +35225,6 @@ "rtm", "rdseed", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -35101,7 +35256,6 @@ "invpcid", "rdseed", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -35136,7 +35290,6 @@ "rtm", "rdseed", "avx512vbmi", - "umip", "avx512vbmi2", "gfni", "vaes", @@ -35389,7 +35542,6 @@ "avx2", "rdseed", "sha-ni", - "umip", "rdpid", "fxsr-opt", "misalignsse", @@ -35422,7 +35574,6 @@ "avx2", "rdseed", "sha-ni", - "umip", "rdpid", "fxsr-opt", "misalignsse", @@ -35453,7 +35604,6 @@ "avx2", "rdseed", "sha-ni", - "umip", "rdpid", "fxsr-opt", "misalignsse", @@ -35487,7 +35637,6 @@ "invpcid", "rdseed", "sha-ni", - "umip", "rdpid", "fsrm", "fxsr-opt", @@ -35523,7 +35672,6 @@ "invpcid", "rdseed", "sha-ni", - "umip", "rdpid", "fsrm", "fxsr-opt", @@ -36569,7 +36717,7 @@ "fsrm": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, - "umip": false, + "umip": true, "vmx-store-lma": false, "vmx-movdr-exit": false, "pse": true, @@ -36916,7 +37064,7 @@ "fsrm": false, "vmx-entry-load-perf-global-ctrl": false, "vmx-io-bitmap": false, - "umip": false, + "umip": true, "vmx-store-lma": false, "vmx-movdr-exit": false, "pse": true, @@ -37080,7 +37228,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -37167,7 +37315,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -37266,7 +37414,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { @@ -37359,7 +37507,7 @@ "numa-mem-supported": true, "default-cpu-type": "qemu64-x86_64-cpu", "cpu-max": 255, - "deprecated": false, + "deprecated": true, "default-ram-id": "pc.ram" }, { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index ae800abcc4..11a2cd16e5 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -246,7 +246,7 @@ <version>6002050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v6.2.0-874-g1cd2ad11d3</package> + <package>v6.2.0-2347-gd9ccf33f94</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -1590,7 +1590,7 @@ <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-5.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1599,7 +1599,7 @@ <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='x-remote' maxCpus='1'/> <machine type='kvm' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1610,7 +1610,7 @@ <machine type='kvm' name='pc-i440fx-5.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1619,7 +1619,7 @@ <machine type='kvm' name='pc-q35-6.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='kvm' name='pc-q35-5.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1885,7 +1885,7 @@ <property name='fsrm' type='boolean' value='false'/> <property name='vmx-entry-load-perf-global-ctrl' type='boolean' value='false'/> <property name='vmx-io-bitmap' type='boolean' value='false'/> - <property name='umip' type='boolean' value='false'/> + <property name='umip' type='boolean' value='true' migratable='yes'/> <property name='vmx-store-lma' type='boolean' value='false'/> <property name='vmx-movdr-exit' type='boolean' value='false'/> <property name='pse' type='boolean' value='true' migratable='yes'/> @@ -2005,7 +2005,6 @@ <blocker name='tsc-deadline'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='gfni'/> <blocker name='cldemote'/> <blocker name='movdiri'/> @@ -2022,7 +2021,6 @@ <blocker name='tsc-deadline'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='gfni'/> <blocker name='cldemote'/> <blocker name='movdiri'/> @@ -2041,7 +2039,6 @@ <blocker name='tsc-deadline'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='gfni'/> <blocker name='cldemote'/> <blocker name='movdiri'/> @@ -2059,7 +2056,6 @@ <blocker name='tsc-deadline'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='gfni'/> <blocker name='cldemote'/> <blocker name='movdiri'/> @@ -2077,7 +2073,6 @@ <blocker name='tsc-deadline'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='gfni'/> <blocker name='cldemote'/> <blocker name='movdiri'/> @@ -2512,7 +2507,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2554,7 +2548,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2593,7 +2586,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2630,7 +2622,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2662,7 +2653,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2692,7 +2682,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2724,7 +2713,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2749,7 +2737,6 @@ <blocker name='invpcid'/> <blocker name='rdseed'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2775,7 +2762,6 @@ <blocker name='invpcid'/> <blocker name='rdseed'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2802,7 +2788,6 @@ <blocker name='rtm'/> <blocker name='rdseed'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2827,7 +2812,6 @@ <blocker name='invpcid'/> <blocker name='rdseed'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -2854,7 +2838,6 @@ <blocker name='rtm'/> <blocker name='rdseed'/> <blocker name='avx512vbmi'/> - <blocker name='umip'/> <blocker name='avx512vbmi2'/> <blocker name='gfni'/> <blocker name='vaes'/> @@ -3018,7 +3001,6 @@ <blocker name='avx2'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> @@ -3044,7 +3026,6 @@ <blocker name='avx2'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> @@ -3068,7 +3049,6 @@ <blocker name='avx2'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='rdpid'/> <blocker name='fxsr-opt'/> <blocker name='misalignsse'/> @@ -3094,7 +3074,6 @@ <blocker name='invpcid'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='rdpid'/> <blocker name='fsrm'/> <blocker name='fxsr-opt'/> @@ -3123,7 +3102,6 @@ <blocker name='invpcid'/> <blocker name='rdseed'/> <blocker name='sha-ni'/> - <blocker name='umip'/> <blocker name='rdpid'/> <blocker name='fsrm'/> <blocker name='fxsr-opt'/> @@ -3670,7 +3648,7 @@ <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-5.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3679,7 +3657,7 @@ <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='x-remote' maxCpus='1'/> <machine type='tcg' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3690,7 +3668,7 @@ <machine type='tcg' name='pc-i440fx-5.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3699,7 +3677,7 @@ <machine type='tcg' name='pc-q35-6.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes'/> <machine type='tcg' name='pc-q35-5.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> -- 2.35.1
Detect that qemu can override TLS hostname setting for NBD clients. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 + 3 files changed, 8 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 529e9ceaf5..32980e7330 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -665,6 +665,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-mem-pci.prealloc", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC */ "calc-dirty-rate", /* QEMU_CAPS_CALC_DIRTY_RATE */ "dirtyrate-param.mode", /* QEMU_CAPS_DIRTYRATE_MODE */ + + /* 425 */ + "blockdev.nbd.tls-hostname", /* QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME */ ); @@ -1599,6 +1602,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/+rbd/encrypt", QEMU_CAPS_RBD_ENCRYPTION }, { "blockdev-add/arg-type/discard", QEMU_CAPS_DRIVE_DISCARD }, { "blockdev-add/arg-type/detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, + { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME }, { "blockdev-backup", QEMU_CAPS_BLOCKDEV_BACKUP }, { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY }, { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f6188b42de..0a215a11d5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -641,6 +641,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */ QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */ + /* 425 */ + QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME, /* tls hostname can be overriden for NBD clients */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 11a2cd16e5..0f34a341af 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -243,6 +243,7 @@ <flag name='virtio-mem-pci.prealloc'/> <flag name='calc-dirty-rate'/> <flag name='dirtyrate-param.mode'/> + <flag name='blockdev.nbd.tls-hostname'/> <version>6002050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.35.1
We do support non-shared storage migration with TLS now. Fix the comment claiming otherwise. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 43ee094486..42fc5c5d62 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4144,10 +4144,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, host = spec->dest.host.name; } - /* Currently libvirt does not support setting up of the NBD - * non-shared storage migration with TLS. As we need to honour the - * VIR_MIGRATE_TLS flag, we need to reject such migration until - * we implement TLS for NBD. */ + /* Allow migration with TLS only when we also support TLS for the NBD connection */ if (flags & VIR_MIGRATE_TLS && !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_DEL)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", -- 2.35.1
On a Thursday in 2022, Peter Krempa wrote:
We do support non-shared storage migration with TLS now. Fix the comment claiming otherwise.
Fixes: a8dc146a4d14b6f169f27b6d238452beb254a637
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The value will be used to override the hostname used for validation of TLS certificates. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/conf/storage_source_conf.c | 2 ++ src/conf/storage_source_conf.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 5c5422ab0c..1a7284ec12 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -827,6 +827,7 @@ virStorageSourceCopy(const virStorageSource *src, def->compat = g_strdup(src->compat); def->tlsAlias = g_strdup(src->tlsAlias); def->tlsCertdir = g_strdup(src->tlsCertdir); + def->tlsHostname = g_strdup(src->tlsHostname); def->query = g_strdup(src->query); if (src->sliceStorage) @@ -1137,6 +1138,7 @@ virStorageSourceClear(virStorageSource *def) VIR_FREE(def->tlsAlias); VIR_FREE(def->tlsCertdir); + VIR_FREE(def->tlsHostname); VIR_FREE(def->ssh_user); diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index c720d093be..2fc9cc6518 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -358,6 +358,9 @@ struct _virStorageSource { char *tlsAlias; char *tlsCertdir; + /* TLS hostname override */ + char *tlsHostname; + bool detected; /* true if this entry was not provided by the user */ unsigned int debugLevel; -- 2.35.1
Add validation and formatting of the blockdev props. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_block.c | 6 +++++- src/qemu/qemu_domain.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e5ff653a60..4195883a1e 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -843,6 +843,7 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src, { g_autoptr(virJSONValue) serverprops = NULL; const char *tlsAlias = src->tlsAlias; + const char *tlsHostname = src->tlsHostname; virJSONValue *ret = NULL; if (src->nhosts != 1) { @@ -856,13 +857,16 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src, if (!serverprops) return NULL; - if (onlytarget) + if (onlytarget) { tlsAlias = NULL; + tlsHostname = NULL; + } if (virJSONValueObjectAdd(&ret, "a:server", &serverprops, "S:export", src->path, "S:tls-creds", tlsAlias, + "S:tls-hostname", tlsHostname, NULL) < 0) return NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6b61fefb8f..ec6c17774b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4862,6 +4862,21 @@ qemuDomainValidateStorageSource(virStorageSource *src, } } + if (src->tlsHostname) { + if (actualType != VIR_STORAGE_TYPE_NETWORK || + src->protocol != VIR_STORAGE_NET_PROTOCOL_NBD) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'tlsHostname' field is supported only with NBD disks")); + return -1; + } + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'tlsHostname' field is not supported by this QEMU")); + return -1; + } + } + return 0; } -- 2.35.1
In cases when the hostname of the NBD server doesn't match the hostname in the TLS certificate the new attribute 'tlsHostname' can be used to override it. Add the XML infrastructure and tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- docs/formatdomain.rst | 4 +- docs/schemas/domaincommon.rng | 3 ++ src/conf/domain_conf.c | 3 ++ ...work-tlsx509-nbd-hostname.x86_64-6.2.0.err | 1 + ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 38 +++++++++++++++++++ .../disk-network-tlsx509-nbd-hostname.xml | 31 +++++++++++++++ tests/qemuxml2argvtest.c | 2 + ...ork-tlsx509-nbd-hostname.x86_64-latest.xml | 37 ++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 9202cd3107..9b1b69bb4d 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2653,7 +2653,9 @@ paravirtualized driver is specified via the ``disk`` element. be enabled by setting the ``tls`` attribute to ``yes``. For the QEMU hypervisor, usage of a TLS environment can also be globally controlled on the host by the ``nbd_tls`` and ``nbd_tls_x509_cert_dir`` in - /etc/libvirt/qemu.conf. ('tls' :since:`Since 4.5.0` ) + /etc/libvirt/qemu.conf. ('tls' :since:`Since 4.5.0` ) :since:`Since 8.2.0` + the optional attribute ``tlsHostname`` can be used to override the + expected host name of the NBD server used for TLS certificate verification. For protocols ``http`` and ``https`` an optional attribute ``query`` specifies the query string. ( :since:`Since 6.2.0` ) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 964b0c9e2f..9c1b64a644 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2071,6 +2071,9 @@ <ref name="virYesNo"/> </attribute> </optional> + <optional> + <attribute name="tlsHostname"/> + </optional> <ref name="diskSourceCommon"/> <ref name="diskSourceNetworkHost"/> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34fec887a3..6c5a818649 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8293,6 +8293,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, &src->haveTLS) < 0) return -1; + src->tlsHostname = virXMLPropString(node, "tlsHostname"); + if (flags & VIR_DOMAIN_DEF_PARSE_STATUS) { int value; if (virXMLPropInt(node, "tlsFromConfig", 10, VIR_XML_PROP_NONE, @@ -23043,6 +23045,7 @@ virDomainDiskSourceFormatNetwork(virBuffer *attrBuf, src->tlsFromConfig)) virBufferAsprintf(attrBuf, " tls='%s'", virTristateBoolTypeToString(src->haveTLS)); + virBufferEscapeString(attrBuf, " tlsHostname='%s'", src->tlsHostname); if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) virBufferAsprintf(attrBuf, " tlsFromConfig='%d'", src->tlsFromConfig); diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err new file mode 100644 index 0000000000..685926157f --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err @@ -0,0 +1 @@ +unsupported configuration: 'tlsHostname' field is not supported by this QEMU diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args new file mode 100644 index 0000000000..870ec42482 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \ +-object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd/dummy,path","endpoint":"client","verify-peer":true,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","tls-hostname":"test-hostname","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml new file mode 100644 index 0000000000..48425d2dd7 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw' cache='none'/> + <source protocol='nbd' tls='yes' tlsHostname="test-hostname"> + <host name='example.com' port='1234'/> + </source> + <target dev='vdd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7e1167e60e..e7fecb24d3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1391,6 +1391,8 @@ mymain(void) DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); + DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname", "6.2.0"); + DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); driver.config->vxhsTLS = 0; diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml new file mode 100644 index 0000000000..216236582b --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw' cache='none'/> + <source protocol='nbd' tls='yes' tlsHostname='test-hostname'> + <host name='example.com' port='1234'/> + </source> + <target dev='vdd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2174965784..31917e5238 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -346,6 +346,7 @@ mymain(void) DO_TEST_NOCAPS("disk-network-vxhs"); DO_TEST_CAPS_LATEST("disk-network-nfs"); DO_TEST_NOCAPS("disk-network-tlsx509-nbd"); + DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_NOCAPS("disk-network-tlsx509-vxhs"); DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS); DO_TEST_CAPS_LATEST("disk-vhostuser"); -- 2.35.1
The NBD connection for non-shared storage migration can have the same issue regarding TLS certificate name match as the migration connection itself. Propagate the configured name also for the NBD connections. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1901448 Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 21 +++++++++++++++++---- src/qemu/qemu_migration_params.c | 17 +++++++++++++++++ src/qemu/qemu_migration_params.h | 3 +++ 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 42fc5c5d62..3650de3de8 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -883,7 +883,8 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDef *disk, const char *host, int port, const char *socket, - const char *tlsAlias) + const char *tlsAlias, + const char *tlsHostname) { g_autoptr(virStorageSource) copysrc = NULL; @@ -910,6 +911,7 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDef *disk, } copysrc->tlsAlias = g_strdup(tlsAlias); + copysrc->tlsHostname = g_strdup(tlsHostname); copysrc->nodestorage = g_strdup_printf("migration-%s-storage", disk->dst); copysrc->nodeformat = g_strdup_printf("migration-%s-format", disk->dst); @@ -931,6 +933,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver, unsigned long long mirror_speed, unsigned int mirror_shallow, const char *tlsAlias, + const char *tlsHostname, bool syncWrites) { g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; @@ -940,7 +943,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver, VIR_DEBUG("starting blockdev mirror for disk=%s to host=%s", disk->dst, host); - if (!(copysrc = qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(disk, host, port, socket, tlsAlias))) + if (!(copysrc = qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(disk, host, port, socket, + tlsAlias, tlsHostname))) return -1; /* Migration via blockdev-mirror was supported sooner than the auto-read-only @@ -1025,6 +1029,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver, unsigned long long mirror_speed, bool mirror_shallow, const char *tlsAlias, + const char *tlsHostname, unsigned int flags) { qemuDomainObjPrivate *priv = vm->privateData; @@ -1065,6 +1070,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver, mirror_speed, mirror_shallow, tlsAlias, + tlsHostname, syncWrites); } else { rc = qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskAlias, @@ -1114,6 +1120,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, const char **migrate_disks, virConnectPtr dconn, const char *tlsAlias, + const char *tlsHostname, const char *nbdURI, unsigned int flags) { @@ -1137,6 +1144,11 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, } mirror_speed <<= 20; + /* If qemu doesn't support overriding of TLS hostname for NBD connections + * we won't attempt it */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME)) + tlsHostname = NULL; + /* steal NBD port and thus prevent its propagation back to destination */ port = mig->nbd->port; mig->nbd->port = 0; @@ -1185,7 +1197,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, if (qemuMigrationSrcNBDStorageCopyOne(driver, vm, disk, host, port, socket, mirror_speed, mirror_shallow, - tlsAlias, flags) < 0) + tlsAlias, tlsHostname, flags) < 0) return -1; if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { @@ -4138,6 +4150,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, if (storageMigration) { if (mig->nbd) { const char *host = ""; + const char *tlsHostname = qemuMigrationParamsGetTLSHostname(migParams); if (spec->destType == MIGRATION_DEST_HOST || spec->destType == MIGRATION_DEST_CONNECT_HOST) { @@ -4157,7 +4170,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, priv->migMaxBandwidth, nmigrate_disks, migrate_disks, - dconn, tlsAlias, + dconn, tlsAlias, tlsHostname, nbdURI, flags) < 0) { goto error; } diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 7b225fdf4b..e30fd04ada 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -1464,3 +1464,20 @@ qemuMigrationCapsGet(virDomainObj *vm, return enabled; } + + +/** + * qemuMigrationParamsGetTLSHostname: + * @migParams: Migration params object + * + * Fetches the value of the QEMU_MIGRATION_PARAM_TLS_HOSTNAME parameter which is + * passed from the user as VIR_MIGRATE_PARAM_TLS_DESTINATION + */ +const char * +qemuMigrationParamsGetTLSHostname(qemuMigrationParams *migParams) +{ + if (!migParams->params[QEMU_MIGRATION_PARAM_TLS_HOSTNAME].set) + return NULL; + + return migParams->params[QEMU_MIGRATION_PARAM_TLS_HOSTNAME].value.s; +} diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index b4de8dda7b..4a8815e776 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -167,3 +167,6 @@ qemuMigrationCapsCheck(virQEMUDriver *driver, bool qemuMigrationCapsGet(virDomainObj *vm, qemuMigrationCapability cap); + +const char * +qemuMigrationParamsGetTLSHostname(qemuMigrationParams *migParams); -- 2.35.1
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index f0270b9bb1..b9b9807625 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -19,6 +19,12 @@ v8.2.0 (unreleased) * **Improvements** + * qemu: ``VIR_MIGRATE_PARAM_TLS_DESTINATION`` now works with non-shared storage migration + + The setting now also applies to the NBD connections for non-shared storage + migration allowing migration to proceed even when the user expects certificate + name not to match. + * **Bug fixes** * Both build and tests should now pass on Alpine Linux or any other -- 2.35.1
Autofree the temporary string and shuffle around the success path to avoid the 'cleanup' label. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3650de3de8..69bcdafdf8 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1035,7 +1035,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver, qemuDomainObjPrivate *priv = vm->privateData; qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuBlockJobData *job = NULL; - char *diskAlias = NULL; + g_autofree char *diskAlias = NULL; const char *jobname = NULL; const char *sourcename = NULL; bool persistjob = false; @@ -1044,10 +1044,10 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver, int ret = -1; if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk))) - goto cleanup; + return -1; if (!(job = qemuBlockJobDiskNew(vm, disk, QEMU_BLOCKJOB_TYPE_COPY, diskAlias))) - goto cleanup; + return -1; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { jobname = diskAlias; @@ -1079,17 +1079,13 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver, mirror_shallow); } - if (rc < 0) - goto cleanup; - - diskPriv->migrating = true; - qemuBlockJobStarted(job, vm); - - ret = 0; + if (rc == 0) { + diskPriv->migrating = true; + qemuBlockJobStarted(job, vm); + ret = 0; + } - cleanup: qemuBlockJobStartupFinalize(vm, job); - VIR_FREE(diskAlias); return ret; } -- 2.35.1
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_blockjob.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 2442865b9b..7032814d21 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -227,8 +227,6 @@ qemuBlockJobUnregister(qemuBlockJobData *job, * @disk: disk definition * * Start/associate a new blockjob with @disk. - * - * Returns 0 on success and -1 on failure. */ qemuBlockJobData * qemuBlockJobDiskNew(virDomainObj *vm, -- 2.35.1
On a Thursday in 2022, Peter Krempa wrote:
Technically patch 7/10 is more of a RFC for now as my migration setup doesn't work properly so I could not test it.
I have not tested it either.
Peter Krempa (10): tests: qemucapabilities: Update caps_7.0.0.x86_64 qemu: capabilities: Introduce QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME qemuMigrationSrcRun: Fix misleading comment about NBD with TLS support storage_source: Add 'tlsHostname' field to virStorageSource qemu: Add support for 'tlsHostname' setting of virStorageSource conf: Add support for setting expected TLS hostname for NBD disks qemu: migration: Use 'VIR_MIGRATE_PARAM_TLS_DESTINATION' for the NBD connection NEWS: Mention that VIR_MIGRATE_PARAM_TLS_DESTINATION works now for non-shared storage migration qemuMigrationSrcNBDStorageCopyOne: Refactor cleanup qemuBlockJobDiskNew: Remove misleading return value description
NEWS.rst | 6 + docs/formatdomain.rst | 4 +- docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 3 + src/conf/storage_source_conf.c | 2 + src/conf/storage_source_conf.h | 3 + src/qemu/qemu_block.c | 6 +- src/qemu/qemu_blockjob.c | 2 - src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_domain.c | 15 + src/qemu/qemu_migration.c | 46 +- src/qemu/qemu_migration_params.c | 17 + src/qemu/qemu_migration_params.h | 3 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../caps_7.0.0.x86_64.replies | 2202 +++++++++-------- .../caps_7.0.0.x86_64.xml | 43 +- ...work-tlsx509-nbd-hostname.x86_64-6.2.0.err | 1 + ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 38 + .../disk-network-tlsx509-nbd-hostname.xml | 31 + tests/qemuxml2argvtest.c | 2 + ...ork-tlsx509-nbd-hostname.x86_64-latest.xml | 37 + tests/qemuxml2xmltest.c | 1 + 23 files changed, 1390 insertions(+), 1083 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.xml
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa