Include the 'transform' member of 'block-bitmap-mapping'. Note that this is based on uncommited patches and will be updated once they are merged. --- .../caps_6.0.0.x86_64.replies | 510 ++++++++++-------- .../caps_6.0.0.x86_64.xml | 16 +- 2 files changed, 306 insertions(+), 220 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies index a1e3850b59..1af61272af 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies @@ -21,7 +21,7 @@ "minor": 2, "major": 5 }, - "package": "v5.2.0-1810-g2436651b26" + "package": "v5.2.0-1934-ge7bdfa1463" }, "id": "libvirt-2" } @@ -667,6 +667,10 @@ "name": "vhost-user-vsock-device", "parent": "vhost-vsock-common" }, + { + "name": "virtio-blk-pci-transitional", + "parent": "virtio-blk-pci-base" + }, { "name": "pcie-pci-bridge", "parent": "base-pci-bridge" @@ -708,8 +712,8 @@ "parent": "pci-device" }, { - "name": "sev-guest", - "parent": "confidential-guest-support" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { "name": "usb-redir", @@ -732,8 +736,8 @@ "parent": "pci-vga" }, { - "name": "virtio-blk-pci-transitional", - "parent": "virtio-blk-pci-base" + "name": "kvm-pit", + "parent": "pit-common" }, { "name": "Haswell-v1-x86_64-cpu", @@ -756,8 +760,8 @@ "parent": "generic-pc-machine" }, { - "name": "kvm-pit", - "parent": "pit-common" + "name": "sev-guest", + "parent": "confidential-guest-support" }, { "name": "ich9-usb-uhci5", @@ -811,6 +815,10 @@ "name": "usb-hub", "parent": "usb-device" }, + { + "name": "chardev-serial", + "parent": "chardev-fd" + }, { "name": "virtio-blk-device", "parent": "virtio-device" @@ -852,8 +860,8 @@ "parent": "accel" }, { - "name": "chardev-serial", - "parent": "chardev-fd" + "name": "Cooperlake-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-vsock-pci", @@ -891,14 +899,14 @@ "name": "memory-backend-ram", "parent": "memory-backend" }, - { - "name": "PCIE", - "parent": "PCI" - }, { "name": "e1000e", "parent": "pci-device" }, + { + "name": "PCIE", + "parent": "PCI" + }, { "name": "n270-x86_64-cpu", "parent": "x86_64-cpu" @@ -907,10 +915,6 @@ "name": "pxb-host", "parent": "pci-host-bridge" }, - { - "name": "Cooperlake-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "scsi-disk", "parent": "scsi-disk-base" @@ -979,14 +983,14 @@ "name": "pci-ipmi-kcs", "parent": "pci-device" }, - { - "name": "intel-iommu-iommu-memory-region", - "parent": "qemu:iommu-memory-region" - }, { "name": "xio3130-downstream", "parent": "pcie-slot" }, + { + "name": "intel-iommu-iommu-memory-region", + "parent": "qemu:iommu-memory-region" + }, { "name": "vhost-user-vsock-pci-non-transitional", "parent": "vhost-user-vsock-pci-base" @@ -995,14 +999,14 @@ "name": "pc-i440fx-2.3-machine", "parent": "generic-pc-machine" }, - { - "name": "PCI", - "parent": "bus" - }, { "name": "microvm-machine", "parent": "x86-machine" }, + { + "name": "PCI", + "parent": "bus" + }, { "name": "sdhci-bus", "parent": "sd-bus" @@ -1104,8 +1108,8 @@ "parent": "pci-device" }, { - "name": "virtio-input-host-pci", - "parent": "virtio-input-host-pci-base-type" + "name": "virtio-9p-pci-transitional", + "parent": "virtio-9p-pci-base" }, { "name": "nvdimm", @@ -1116,8 +1120,8 @@ "parent": "generic-pc-machine" }, { - "name": "virtio-9p-pci-transitional", - "parent": "virtio-9p-pci-base" + "name": "virtio-input-host-pci", + "parent": "virtio-input-host-pci-base-type" }, { "name": "Opteron_G1-x86_64-cpu", @@ -1143,6 +1147,10 @@ "name": "i82557c", "parent": "pci-device" }, + { + "name": "i82557b", + "parent": "pci-device" + }, { "name": "virtio-scsi-device", "parent": "virtio-scsi-common" @@ -1151,10 +1159,6 @@ "name": "pxb-pcie", "parent": "pci-device" }, - { - "name": "i82557b", - "parent": "pci-device" - }, { "name": "Haswell-IBRS-x86_64-cpu", "parent": "x86_64-cpu" @@ -1172,12 +1176,8 @@ "parent": "sys-bus-device" }, { - "name": "chardev-memory", - "parent": "chardev-ringbuf" - }, - { - "name": "pc-q35-2.8-machine", - "parent": "generic-pc-machine" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", @@ -1188,12 +1188,16 @@ "parent": "isa-device" }, { - "name": "generic-sdhci", - "parent": "sys-bus-device" + "name": "chardev-udp", + "parent": "chardev" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "pc-q35-2.8-machine", + "parent": "generic-pc-machine" + }, + { + "name": "generic-sdhci", + "parent": "sys-bus-device" }, { "name": "virtio-scsi-pci-non-transitional", @@ -1212,8 +1216,8 @@ "parent": "x86_64-cpu" }, { - "name": "chardev-udp", - "parent": "chardev" + "name": "chardev-memory", + "parent": "chardev-ringbuf" }, { "name": "EPYC-Rome-v1-x86_64-cpu", @@ -1263,14 +1267,14 @@ "name": "virtio-9p-pci-non-transitional", "parent": "virtio-9p-pci-base" }, - { - "name": "Nehalem-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "memory-backend-file", "parent": "memory-backend" }, + { + "name": "Nehalem-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "vhost-vsock-device", "parent": "vhost-vsock-common" @@ -1331,10 +1335,6 @@ "name": "tcg-accel", "parent": "accel" }, - { - "name": "piix4-ide", - "parent": "pci-ide" - }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" @@ -1367,6 +1367,10 @@ "name": "ES1370", "parent": "pci-device" }, + { + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" + }, { "name": "i82551", "parent": "pci-device" @@ -1384,8 +1388,8 @@ "parent": "x86_64-cpu" }, { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" + "name": "piix4-ide", + "parent": "pci-ide" }, { "name": "SandyBridge-x86_64-cpu", @@ -1427,14 +1431,14 @@ "name": "kvm-apic", "parent": "apic-common" }, - { - "name": "isa-pit", - "parent": "pit-common" - }, { "name": "kvm64-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "isa-pit", + "parent": "pit-common" + }, { "name": "Broadwell-v4-x86_64-cpu", "parent": "x86_64-cpu" @@ -1499,14 +1503,6 @@ "name": "core2duo-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "vhost-user-blk-pci-non-transitional", - "parent": "vhost-user-blk-pci-base" - }, - { - "name": "virtio-rng-pci-non-transitional", - "parent": "virtio-rng-pci-base" - }, { "name": "cirrus-vga", "parent": "pci-device" @@ -1523,13 +1519,17 @@ "name": "pc-i440fx-2.1-machine", "parent": "generic-pc-machine" }, + { + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" + }, { "name": "i82559er", "parent": "pci-device" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "virtio-rng-pci-non-transitional", + "parent": "virtio-rng-pci-base" }, { "name": "Skylake-Client-x86_64-cpu", @@ -1539,13 +1539,17 @@ "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "container", + "parent": "object" + }, { "name": "isa-ide", "parent": "isa-device" }, { - "name": "container", - "parent": "object" + "name": "486-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "EPYC-v3-x86_64-cpu", @@ -1556,12 +1560,12 @@ "parent": "scsi-disk-base" }, { - "name": "gpex-root", - "parent": "pci-device" + "name": "vhost-user-blk-pci-non-transitional", + "parent": "vhost-user-blk-pci-base" }, { - "name": "486-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "gpex-root", + "parent": "pci-device" }, { "name": "vmport", @@ -1587,14 +1591,14 @@ "name": "e1000-82545em", "parent": "e1000-base" }, - { - "name": "sdhci-pci", - "parent": "pci-device" - }, { "name": "pxb-pcie-bus", "parent": "PCIE" }, + { + "name": "sdhci-pci", + "parent": "pci-device" + }, { "name": "vhost-user-scsi", "parent": "vhost-scsi-common" @@ -1768,11 +1772,11 @@ "parent": "base-sysbus-fdc" }, { - "name": "i82559c", + "name": "AMDVI-PCI", "parent": "pci-device" }, { - "name": "AMDVI-PCI", + "name": "i82559c", "parent": "pci-device" }, { @@ -1820,11 +1824,11 @@ "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82559a", + "name": "kvaser_pci", "parent": "pci-device" }, { - "name": "kvaser_pci", + "name": "i82559a", "parent": "pci-device" }, { @@ -1932,16 +1936,16 @@ "parent": "virtio-iommu-device-base" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "vmcoreinfo", + "parent": "device" }, { "name": "Icelake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "vmcoreinfo", - "parent": "device" + "name": "chardev-braille", + "parent": "chardev" }, { "name": "tpci200", @@ -1963,10 +1967,6 @@ "name": "qio-channel-socket", "parent": "qio-channel" }, - { - "name": "chardev-socket", - "parent": "chardev" - }, { "name": "coreduo-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -1984,17 +1984,13 @@ "parent": "object" }, { - "name": "hyperv-testdev", - "parent": "isa-device" + "name": "chardev-socket", + "parent": "chardev" }, { "name": "clock", "parent": "object" }, - { - "name": "virtio-net-device", - "parent": "virtio-device" - }, { "name": "Haswell-v2-x86_64-cpu", "parent": "x86_64-cpu" @@ -2003,6 +1999,10 @@ "name": "host-x86_64-cpu", "parent": "max-x86_64-cpu" }, + { + "name": "secret", + "parent": "secret_common" + }, { "name": "usb-ehci", "parent": "pci-ehci-usb" @@ -2048,8 +2048,8 @@ "parent": "scsi-disk-base" }, { - "name": "secret", - "parent": "secret_common" + "name": "Cascadelake-Server-noTSX-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "usb-kbd", @@ -2064,16 +2064,16 @@ "parent": "device" }, { - "name": "usb-mtp", - "parent": "usb-device" + "name": "virtio-net-device", + "parent": "virtio-device" }, { "name": "filter-replay", "parent": "netfilter" }, { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "usb-mtp", + "parent": "usb-device" }, { "name": "input-linux", @@ -2088,8 +2088,12 @@ "parent": "x86_64-cpu" }, { - "name": "pc-q35-5.1-machine", - "parent": "generic-pc-machine" + "name": "lsi53c810", + "parent": "lsi53c895a" + }, + { + "name": "hyperv-testdev", + "parent": "isa-device" }, { "name": "s3c-sdhci", @@ -2112,8 +2116,8 @@ "parent": "ccid-card" }, { - "name": "virtconsole", - "parent": "virtserialport" + "name": "pc-q35-5.1-machine", + "parent": "generic-pc-machine" }, { "name": "pc-i440fx-1.7-machine", @@ -2124,21 +2128,21 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "virtconsole", + "parent": "virtserialport" }, { "name": "ioh3420", "parent": "pcie-root-port-base" }, - { - "name": "filter-mirror", - "parent": "netfilter" - }, { "name": "Skylake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "filter-mirror", + "parent": "netfilter" + }, { "name": "throttle-group", "parent": "object" @@ -2235,14 +2239,14 @@ "name": "pc-dimm", "parent": "device" }, - { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" - }, { "name": "virtio-balloon-pci-non-transitional", "parent": "virtio-balloon-pci-base" }, + { + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" + }, { "name": "ipmi-bmc-sim", "parent": "ipmi-bmc" @@ -2303,14 +2307,14 @@ "name": "pxb-bus", "parent": "PCI" }, - { - "name": "virtio-mmio", - "parent": "sys-bus-device" - }, { "name": "pentium2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "virtio-mmio", + "parent": "sys-bus-device" + }, { "name": "Broadwell-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -2567,14 +2571,14 @@ "name": "cfi.pflash01", "parent": "sys-bus-device" }, - { - "name": "Skylake-Server-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-2.7-machine", "parent": "generic-pc-machine" }, + { + "name": "Skylake-Server-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "isa-parallel", "parent": "isa-device" @@ -2796,8 +2800,8 @@ "parent": "x86_64-cpu" }, { - "name": "kvm64-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { "name": "IDE", @@ -2808,8 +2812,8 @@ "parent": "x86_64-cpu" }, { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" + "name": "kvm64-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "mptsas1068", @@ -2907,10 +2911,6 @@ "name": "qio-channel-tls", "parent": "qio-channel" }, - { - "name": "chardev-stdio", - "parent": "chardev-fd" - }, { "name": "virtio-vga", "parent": "virtio-vga-base-type" @@ -7314,6 +7314,10 @@ "name": "xsaves", "type": "bool" }, + { + "name": "vgif", + "type": "bool" + }, { "name": "mce", "type": "bool" @@ -7443,6 +7447,10 @@ "name": "tcg-cpuid", "type": "bool" }, + { + "name": "vmx-entry-load-pkrs", + "type": "bool" + }, { "name": "x-hv-max-vps", "type": "int32" @@ -7700,6 +7708,10 @@ "name": "kvm-pv-tlb-flush", "type": "bool" }, + { + "name": "vmx-rdtsc-exit", + "type": "bool" + }, { "name": "vmx-cr8-load-exit", "type": "bool" @@ -7713,7 +7725,11 @@ "type": "bool" }, { - "name": "vmx-rdtsc-exit", + "name": "svme-addr-chk", + "type": "bool" + }, + { + "name": "vmx-exit-load-pkrs", "type": "bool" }, { @@ -7855,6 +7871,14 @@ "description": "on/off", "type": "bool" }, + { + "name": "avic", + "type": "bool" + }, + { + "name": "ds", + "type": "bool" + }, { "name": "legacy-cache", "type": "bool" @@ -7873,11 +7897,11 @@ "type": "bool" }, { - "name": "ds", + "name": "osvw", "type": "bool" }, { - "name": "osvw", + "name": "pks", "type": "bool" }, { @@ -7904,6 +7928,10 @@ "name": "vmx-cr8-store-exit", "type": "bool" }, + { + "name": "vmx-ept-1gb", + "type": "bool" + }, { "name": "nrip-save", "type": "bool" @@ -7917,7 +7945,7 @@ "type": "bool" }, { - "name": "lmce", + "name": "vmx-ept-2mb", "type": "bool" }, { @@ -7937,7 +7965,7 @@ "type": "bool" }, { - "name": "sse2", + "name": "lmce", "type": "bool" }, { @@ -7965,15 +7993,15 @@ "type": "bool" }, { - "name": "vmx-ept-1gb", + "name": "avx", "type": "bool" }, { - "name": "avx", + "name": "topoext", "type": "bool" }, { - "name": "topoext", + "name": "sse2", "type": "bool" }, { @@ -8171,7 +8199,7 @@ "type": "bool" }, { - "name": "vmx-ept-2mb", + "name": "vmx-page-walk-4", "type": "bool" }, { @@ -8239,7 +8267,7 @@ "type": "bool" }, { - "name": "vmx-page-walk-4", + "name": "v-vmsave-vmload", "type": "bool" }, { @@ -10857,6 +10885,11 @@ ], "option": "iscsi" }, + { + "parameters": [ + ], + "option": "acpi" + }, { "parameters": [ { @@ -10986,6 +11019,31 @@ ], "option": "spice" }, + { + "parameters": [ + { + "name": "resourcecontrol", + "type": "string" + }, + { + "name": "spawn", + "type": "string" + }, + { + "name": "elevateprivileges", + "type": "string" + }, + { + "name": "obsolete", + "type": "string" + }, + { + "name": "enable", + "type": "boolean" + } + ], + "option": "sandbox" + }, { "parameters": [ { @@ -11175,31 +11233,6 @@ ], "option": "fsdev" }, - { - "parameters": [ - { - "name": "resourcecontrol", - "type": "string" - }, - { - "name": "spawn", - "type": "string" - }, - { - "name": "elevateprivileges", - "type": "string" - }, - { - "name": "obsolete", - "type": "string" - }, - { - "name": "enable", - "type": "boolean" - } - ], - "option": "sandbox" - }, { "parameters": [ ], @@ -11298,11 +11331,6 @@ ], "option": "vnc" }, - { - "parameters": [ - ], - "option": "acpi" - }, { "parameters": [ { @@ -25357,6 +25385,11 @@ { "name": "alias", "type": "str" + }, + { + "name": "transform", + "default": null, + "type": "568" } ], "meta-type": "object" @@ -25384,7 +25417,7 @@ "members": [ { "name": "data", - "type": "568" + "type": "569" } ], "meta-type": "object" @@ -25760,7 +25793,7 @@ "members": [ { "name": "bus", - "type": "569" + "type": "570" }, { "name": "devices", @@ -25832,7 +25865,7 @@ "members": [ { "name": "data", - "type": "570" + "type": "571" } ], "meta-type": "object" @@ -25842,7 +25875,7 @@ "members": [ { "name": "data", - "type": "571" + "type": "572" } ], "meta-type": "object" @@ -25852,7 +25885,7 @@ "members": [ { "name": "data", - "type": "572" + "type": "573" } ], "meta-type": "object" @@ -26047,7 +26080,7 @@ "members": [ { "name": "type", - "type": "573" + "type": "574" }, { "name": "hash", @@ -26126,13 +26159,13 @@ }, { "case": "luks", - "type": "575" + "type": "576" } ], "members": [ { "name": "format", - "type": "574" + "type": "575" } ], "meta-type": "object" @@ -26158,17 +26191,17 @@ "variants": [ { "case": "full", - "type": "577" + "type": "578" }, { "case": "erasure-coded", - "type": "578" + "type": "579" } ], "members": [ { "name": "type", - "type": "576" + "type": "577" } ], "meta-type": "object" @@ -26224,7 +26257,7 @@ "variants": [ { "case": "luks", - "type": "579" + "type": "580" }, { "case": "qcow", @@ -26234,7 +26267,7 @@ "members": [ { "name": "format", - "type": "574" + "type": "575" } ], "meta-type": "object" @@ -26732,7 +26765,7 @@ "members": [ { "name": "button", - "type": "580" + "type": "581" }, { "name": "down", @@ -26746,7 +26779,7 @@ "members": [ { "name": "axis", - "type": "581" + "type": "582" }, { "name": "value", @@ -26758,11 +26791,22 @@ { "name": "568", "members": [ + { + "name": "persistent", + "default": null, + "type": "bool" + } ], "meta-type": "object" }, { "name": "569", + "members": [ + ], + "meta-type": "object" + }, + { + "name": "570", "members": [ { "name": "number", @@ -26778,21 +26822,21 @@ }, { "name": "io_range", - "type": "582" + "type": "583" }, { "name": "memory_range", - "type": "582" + "type": "583" }, { "name": "prefetchable_range", - "type": "582" + "type": "583" } ], "meta-type": "object" }, { - "name": "570", + "name": "571", "members": [ { "name": "compat", @@ -26830,12 +26874,12 @@ { "name": "encrypt", "default": null, - "type": "583" + "type": "584" }, { "name": "bitmaps", "default": null, - "type": "[584]" + "type": "[585]" }, { "name": "compression-type", @@ -26845,7 +26889,7 @@ "meta-type": "object" }, { - "name": "571", + "name": "572", "members": [ { "name": "create-type", @@ -26867,7 +26911,7 @@ "meta-type": "object" }, { - "name": "572", + "name": "573", "members": [ { "name": "cipher-alg", @@ -26904,13 +26948,13 @@ }, { "name": "slots", - "type": "[585]" + "type": "[586]" } ], "meta-type": "object" }, { - "name": "573", + "name": "574", "meta-type": "enum", "values": [ "md5", @@ -26918,7 +26962,7 @@ ] }, { - "name": "574", + "name": "575", "meta-type": "enum", "values": [ "qcow", @@ -26926,7 +26970,7 @@ ] }, { - "name": "575", + "name": "576", "members": [ { "name": "key-secret", @@ -26967,7 +27011,7 @@ "meta-type": "object" }, { - "name": "576", + "name": "577", "meta-type": "enum", "values": [ "full", @@ -26975,7 +27019,7 @@ ] }, { - "name": "577", + "name": "578", "members": [ { "name": "copies", @@ -26985,7 +27029,7 @@ "meta-type": "object" }, { - "name": "578", + "name": "579", "members": [ { "name": "data-strips", @@ -26999,7 +27043,7 @@ "meta-type": "object" }, { - "name": "579", + "name": "580", "members": [ { "name": "state", @@ -27034,7 +27078,7 @@ "meta-type": "object" }, { - "name": "580", + "name": "581", "meta-type": "enum", "values": [ "left", @@ -27047,7 +27091,7 @@ ] }, { - "name": "581", + "name": "582", "meta-type": "enum", "values": [ "x", @@ -27055,7 +27099,7 @@ ] }, { - "name": "582", + "name": "583", "members": [ { "name": "base", @@ -27069,12 +27113,12 @@ "meta-type": "object" }, { - "name": "583", + "name": "584", "tag": "format", "variants": [ { "case": "luks", - "type": "572" + "type": "573" }, { "case": "aes", @@ -27090,12 +27134,12 @@ "meta-type": "object" }, { - "name": "[584]", - "element-type": "584", + "name": "[585]", + "element-type": "585", "meta-type": "array" }, { - "name": "584", + "name": "585", "members": [ { "name": "name", @@ -27107,7 +27151,7 @@ }, { "name": "flags", - "type": "[586]" + "type": "[587]" } ], "meta-type": "object" @@ -27118,12 +27162,12 @@ "meta-type": "array" }, { - "name": "[585]", - "element-type": "585", + "name": "[586]", + "element-type": "586", "meta-type": "array" }, { - "name": "585", + "name": "586", "members": [ { "name": "active", @@ -27147,12 +27191,12 @@ "meta-type": "object" }, { - "name": "[586]", - "element-type": "586", + "name": "[587]", + "element-type": "587", "meta-type": "array" }, { - "name": "586", + "name": "587", "meta-type": "enum", "values": [ "in-use", @@ -27193,6 +27237,7 @@ "name": "base", "props": { "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": false, "cmov": true, "ia64": false, "ssb-no": false, @@ -27277,6 +27322,7 @@ "vmx-unrestricted-guest": false, "vmx-cr3-store-noexit": false, "pku": false, + "pks": false, "smx": false, "cmp-legacy": true, "avx512-4fmaps": false, @@ -27392,6 +27438,7 @@ "kvmclock": true, "vmx-zero-len-inject": false, "pschange-mc-no": true, + "v-vmsave-vmload": false, "vmx-rdrand-exit": false, "lwp": false, "amd-ssbd": true, @@ -27429,6 +27476,7 @@ "vmx-movdr-exit": false, "pse": true, "avx2": true, + "avic": false, "sep": true, "virt-ssbd": true, "vmx-cr3-load-noexit": false, @@ -27445,6 +27493,7 @@ "amd-stibp": true, "vmx-preemption-timer": false, "clflushopt": true, + "vmx-entry-load-pkrs": false, "vmx-vnmi-pending": false, "monitor": false, "vmx-vintr-pending": false, @@ -27454,6 +27503,7 @@ "pcid": false, "taa-no": false, "arch-capabilities": true, + "vgif": false, "vmx-secondary-ctls": false, "vmx-xsaves": false, "clzero": true, @@ -27488,6 +27538,7 @@ "vmx-entry-load-efer": false, "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", "sha-ni": true, + "vmx-exit-load-pkrs": false, "abm": true, "vmx-ept-advanced-exitinfo": false, "avx512pf": false, @@ -27519,6 +27570,7 @@ "name": "base", "props": { "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": false, "cmov": true, "ia64": false, "ssb-no": false, @@ -27603,6 +27655,7 @@ "vmx-unrestricted-guest": false, "vmx-cr3-store-noexit": false, "pku": false, + "pks": false, "smx": false, "cmp-legacy": true, "avx512-4fmaps": false, @@ -27718,6 +27771,7 @@ "kvmclock": true, "vmx-zero-len-inject": false, "pschange-mc-no": true, + "v-vmsave-vmload": false, "vmx-rdrand-exit": false, "lwp": false, "amd-ssbd": true, @@ -27755,6 +27809,7 @@ "vmx-movdr-exit": false, "pse": true, "avx2": true, + "avic": false, "sep": true, "virt-ssbd": true, "vmx-cr3-load-noexit": false, @@ -27771,6 +27826,7 @@ "amd-stibp": true, "vmx-preemption-timer": false, "clflushopt": true, + "vmx-entry-load-pkrs": false, "vmx-vnmi-pending": false, "monitor": false, "vmx-vintr-pending": false, @@ -27780,6 +27836,7 @@ "pcid": false, "taa-no": false, "arch-capabilities": true, + "vgif": false, "vmx-secondary-ctls": false, "vmx-xsaves": false, "clzero": true, @@ -27814,6 +27871,7 @@ "vmx-entry-load-efer": false, "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", "sha-ni": true, + "vmx-exit-load-pkrs": false, "abm": true, "vmx-ept-advanced-exitinfo": false, "avx512pf": false, @@ -30208,6 +30266,7 @@ "name": "base", "props": { "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": false, "cmov": true, "ia64": false, "ssb-no": false, @@ -30292,6 +30351,7 @@ "vmx-unrestricted-guest": false, "vmx-cr3-store-noexit": false, "pku": true, + "pks": true, "smx": false, "cmp-legacy": false, "avx512-4fmaps": false, @@ -30407,6 +30467,7 @@ "kvmclock": false, "vmx-zero-len-inject": false, "pschange-mc-no": false, + "v-vmsave-vmload": false, "vmx-rdrand-exit": false, "lwp": false, "amd-ssbd": false, @@ -30444,6 +30505,7 @@ "vmx-movdr-exit": false, "pse": true, "avx2": false, + "avic": false, "sep": true, "virt-ssbd": false, "vmx-cr3-load-noexit": false, @@ -30460,6 +30522,7 @@ "amd-stibp": false, "vmx-preemption-timer": false, "clflushopt": true, + "vmx-entry-load-pkrs": false, "vmx-vnmi-pending": false, "monitor": true, "vmx-vintr-pending": false, @@ -30469,6 +30532,7 @@ "pcid": false, "taa-no": false, "arch-capabilities": false, + "vgif": false, "vmx-secondary-ctls": false, "vmx-xsaves": false, "clzero": false, @@ -30503,6 +30567,7 @@ "vmx-entry-load-efer": false, "model-id": "QEMU TCG CPU version 2.5+", "sha-ni": false, + "vmx-exit-load-pkrs": false, "abm": true, "vmx-ept-advanced-exitinfo": false, "avx512pf": false, @@ -30534,6 +30599,7 @@ "name": "base", "props": { "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": false, "cmov": true, "ia64": false, "ssb-no": false, @@ -30618,6 +30684,7 @@ "vmx-unrestricted-guest": false, "vmx-cr3-store-noexit": false, "pku": true, + "pks": true, "smx": false, "cmp-legacy": false, "avx512-4fmaps": false, @@ -30733,6 +30800,7 @@ "kvmclock": false, "vmx-zero-len-inject": false, "pschange-mc-no": false, + "v-vmsave-vmload": false, "vmx-rdrand-exit": false, "lwp": false, "amd-ssbd": false, @@ -30770,6 +30838,7 @@ "vmx-movdr-exit": false, "pse": true, "avx2": false, + "avic": false, "sep": true, "virt-ssbd": false, "vmx-cr3-load-noexit": false, @@ -30786,6 +30855,7 @@ "amd-stibp": false, "vmx-preemption-timer": false, "clflushopt": true, + "vmx-entry-load-pkrs": false, "vmx-vnmi-pending": false, "monitor": true, "vmx-vintr-pending": false, @@ -30795,6 +30865,7 @@ "pcid": false, "taa-no": false, "arch-capabilities": false, + "vgif": false, "vmx-secondary-ctls": false, "vmx-xsaves": false, "clzero": false, @@ -30829,6 +30900,7 @@ "vmx-entry-load-efer": false, "model-id": "QEMU TCG CPU version 2.5+", "sha-ni": false, + "vmx-exit-load-pkrs": false, "abm": true, "vmx-ept-advanced-exitinfo": false, "avx512pf": false, diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index ddfa701798..f2ec32e46b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -258,10 +258,11 @@ <version>5002050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> - <package>v5.2.0-1810-g2436651b26</package> + <package>v5.2.0-1934-ge7bdfa1463</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> + <property name='svme-addr-chk' type='boolean' value='false'/> <property name='cmov' type='boolean' value='true' migratable='yes'/> <property name='ia64' type='boolean' value='false'/> <property name='ssb-no' type='boolean' value='false'/> @@ -346,6 +347,7 @@ <property name='vmx-unrestricted-guest' type='boolean' value='false'/> <property name='vmx-cr3-store-noexit' type='boolean' value='false'/> <property name='pku' type='boolean' value='false'/> + <property name='pks' type='boolean' value='false'/> <property name='smx' type='boolean' value='false'/> <property name='cmp-legacy' type='boolean' value='true' migratable='yes'/> <property name='avx512-4fmaps' type='boolean' value='false'/> @@ -461,6 +463,7 @@ <property name='kvmclock' type='boolean' value='true' migratable='yes'/> <property name='vmx-zero-len-inject' type='boolean' value='false'/> <property name='pschange-mc-no' type='boolean' value='true' migratable='yes'/> + <property name='v-vmsave-vmload' type='boolean' value='false'/> <property name='vmx-rdrand-exit' type='boolean' value='false'/> <property name='lwp' type='boolean' value='false'/> <property name='amd-ssbd' type='boolean' value='true' migratable='yes'/> @@ -498,6 +501,7 @@ <property name='vmx-movdr-exit' type='boolean' value='false'/> <property name='pse' type='boolean' value='true' migratable='yes'/> <property name='avx2' type='boolean' value='true' migratable='yes'/> + <property name='avic' type='boolean' value='false'/> <property name='sep' type='boolean' value='true' migratable='yes'/> <property name='virt-ssbd' type='boolean' value='true' migratable='yes'/> <property name='vmx-cr3-load-noexit' type='boolean' value='false'/> @@ -514,6 +518,7 @@ <property name='amd-stibp' type='boolean' value='true' migratable='yes'/> <property name='vmx-preemption-timer' type='boolean' value='false'/> <property name='clflushopt' type='boolean' value='true' migratable='yes'/> + <property name='vmx-entry-load-pkrs' type='boolean' value='false'/> <property name='vmx-vnmi-pending' type='boolean' value='false'/> <property name='monitor' type='boolean' value='false'/> <property name='vmx-vintr-pending' type='boolean' value='false'/> @@ -523,6 +528,7 @@ <property name='pcid' type='boolean' value='false'/> <property name='taa-no' type='boolean' value='false'/> <property name='arch-capabilities' type='boolean' value='true' migratable='yes'/> + <property name='vgif' type='boolean' value='false'/> <property name='vmx-secondary-ctls' type='boolean' value='false'/> <property name='vmx-xsaves' type='boolean' value='false'/> <property name='clzero' type='boolean' value='true' migratable='yes'/> @@ -557,6 +563,7 @@ <property name='vmx-entry-load-efer' type='boolean' value='false'/> <property name='model-id' type='string' value='AMD Ryzen 9 3900X 12-Core Processor '/> <property name='sha-ni' type='boolean' value='true' migratable='yes'/> + <property name='vmx-exit-load-pkrs' type='boolean' value='false'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/> <property name='avx512pf' type='boolean' value='false'/> @@ -1470,6 +1477,7 @@ <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> + <property name='svme-addr-chk' type='boolean' value='false'/> <property name='cmov' type='boolean' value='true' migratable='yes'/> <property name='ia64' type='boolean' value='false'/> <property name='ssb-no' type='boolean' value='false'/> @@ -1554,6 +1562,7 @@ <property name='vmx-unrestricted-guest' type='boolean' value='false'/> <property name='vmx-cr3-store-noexit' type='boolean' value='false'/> <property name='pku' type='boolean' value='true' migratable='yes'/> + <property name='pks' type='boolean' value='true' migratable='yes'/> <property name='smx' type='boolean' value='false'/> <property name='cmp-legacy' type='boolean' value='false'/> <property name='avx512-4fmaps' type='boolean' value='false'/> @@ -1669,6 +1678,7 @@ <property name='kvmclock' type='boolean' value='false'/> <property name='vmx-zero-len-inject' type='boolean' value='false'/> <property name='pschange-mc-no' type='boolean' value='false'/> + <property name='v-vmsave-vmload' type='boolean' value='false'/> <property name='vmx-rdrand-exit' type='boolean' value='false'/> <property name='lwp' type='boolean' value='false'/> <property name='amd-ssbd' type='boolean' value='false'/> @@ -1706,6 +1716,7 @@ <property name='vmx-movdr-exit' type='boolean' value='false'/> <property name='pse' type='boolean' value='true' migratable='yes'/> <property name='avx2' type='boolean' value='false'/> + <property name='avic' type='boolean' value='false'/> <property name='sep' type='boolean' value='true' migratable='yes'/> <property name='virt-ssbd' type='boolean' value='false'/> <property name='vmx-cr3-load-noexit' type='boolean' value='false'/> @@ -1722,6 +1733,7 @@ <property name='amd-stibp' type='boolean' value='false'/> <property name='vmx-preemption-timer' type='boolean' value='false'/> <property name='clflushopt' type='boolean' value='true' migratable='yes'/> + <property name='vmx-entry-load-pkrs' type='boolean' value='false'/> <property name='vmx-vnmi-pending' type='boolean' value='false'/> <property name='monitor' type='boolean' value='true' migratable='yes'/> <property name='vmx-vintr-pending' type='boolean' value='false'/> @@ -1731,6 +1743,7 @@ <property name='pcid' type='boolean' value='false'/> <property name='taa-no' type='boolean' value='false'/> <property name='arch-capabilities' type='boolean' value='false'/> + <property name='vgif' type='boolean' value='false'/> <property name='vmx-secondary-ctls' type='boolean' value='false'/> <property name='vmx-xsaves' type='boolean' value='false'/> <property name='clzero' type='boolean' value='false'/> @@ -1765,6 +1778,7 @@ <property name='vmx-entry-load-efer' type='boolean' value='false'/> <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/> <property name='sha-ni' type='boolean' value='false'/> + <property name='vmx-exit-load-pkrs' type='boolean' value='false'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/> <property name='avx512pf' type='boolean' value='false'/> -- 2.29.2

The capability represents qemu's ability to setup mappings for migrating block dirty bitmaps and is based on presence of the 'transform' property of the 'block-bitmap-mapping' property of 'migrate-set-parameters' QMP command. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ccf810ff96..38555dde98 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -616,6 +616,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vhost-user-blk", "cpu-max", "memory-backend-file.x-use-canonical-path-for-ramblock-id", + "migration-param.block-bitmap-mapping", ); @@ -1549,6 +1550,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "migrate-set-parameters/arg-type/xbzrle-cache-size", QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA }, + { "migrate-set-parameters/arg-type/block-bitmap-mapping/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6fd7922926..03d6ba60cf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -596,6 +596,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */ QEMU_CAPS_CPU_MAX, /* -cpu max */ QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_RAMBLOCK_ID, /* -object memory-backend-file,x-use-canonical-path-for-ramblock-id= */ + QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING, /* block-bitmap-mapping in migrate-set-parameters */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -- 2.29.2

Such images don't support stuff like dirty bitmaps. Note that the synthetic test for detecting bitmaps is used as an example to prevent adding additional test cases. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 11 +++++++++++ tests/qemublocktest.c | 2 ++ tests/qemublocktestdata/bitmap/synthetic.json | 2 +- tests/qemublocktestdata/bitmap/synthetic.out | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b0068f2a82..7a039641ba 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -732,6 +732,9 @@ struct _qemuBlockNamedNodeData { /* the cluster size of the image is valid only when > 0 */ unsigned long long clusterSize; + + /* image version */ + bool qcow2v2; }; GHashTable * diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3b2a2c7a5..65c30e3bb4 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2979,6 +2979,7 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos G_GNUC_UNUSED, GHashTable *nodes = opaque; virJSONValuePtr img; virJSONValuePtr bitmaps; + virJSONValuePtr format_specific; const char *nodename; g_autoptr(qemuBlockNamedNodeData) ent = NULL; @@ -3001,6 +3002,16 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos G_GNUC_UNUSED, if ((bitmaps = virJSONValueObjectGetArray(val, "dirty-bitmaps"))) qemuMonitorJSONBlockGetNamedNodeDataBitmaps(bitmaps, ent); + /* query qcow2 format specific props */ + if ((format_specific = virJSONValueObjectGetObject(img, "format-specific")) && + STREQ_NULLABLE(virJSONValueObjectGetString(format_specific, "type"), "qcow2")) { + virJSONValuePtr qcow2props = virJSONValueObjectGetObject(format_specific, "data"); + + if (qcow2props && + STREQ_NULLABLE(virJSONValueObjectGetString(qcow2props, "compat"), "0.10")) + ent->qcow2v2 = true; + } + if (virHashAddEntry(nodes, nodename, ent) < 0) return -1; diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index ddaf73359d..bbfcfee92d 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -599,6 +599,8 @@ testQemuDetectBitmapsWorker(GHashTable *nodedata, return; virBufferAsprintf(buf, "%s:\n", nodename); + if (data->qcow2v2) + virBufferAddLit(buf, " qcow2 v2\n"); virBufferAdjustIndent(buf, 1); for (i = 0; i < data->nbitmaps; i++) { diff --git a/tests/qemublocktestdata/bitmap/synthetic.json b/tests/qemublocktestdata/bitmap/synthetic.json index 3712c8e5fc..cd468a42a2 100644 --- a/tests/qemublocktestdata/bitmap/synthetic.json +++ b/tests/qemublocktestdata/bitmap/synthetic.json @@ -12,7 +12,7 @@ "format-specific": { "type": "qcow2", "data": { - "compat": "1.1", + "compat": "0.10", "compression-type": "zlib", "lazy-refcounts": false, "bitmaps": [ diff --git a/tests/qemublocktestdata/bitmap/synthetic.out b/tests/qemublocktestdata/bitmap/synthetic.out index cde7228e01..2d9545fc9b 100644 --- a/tests/qemublocktestdata/bitmap/synthetic.out +++ b/tests/qemublocktestdata/bitmap/synthetic.out @@ -1,4 +1,5 @@ libvirt-1-format: + qcow2 v2 current: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0 top-ok: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 top-inactive: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0 -- 2.29.2

It's already initialized to '1'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/libvirt-domain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index dba89a7d3a..e9688a15b4 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3089,7 +3089,6 @@ virDomainMigrateVersion3Full(virDomainPtr domain, virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { - cancelled = 1; virErrorPreserveLast(&orig_err); goto finish; } @@ -3098,7 +3097,6 @@ virDomainMigrateVersion3Full(virDomainPtr domain, VIR_MIGRATE_PARAM_URI, &uri) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare3 did not set uri")); - cancelled = 1; virErrorPreserveLast(&orig_err); goto finish; } -- 2.29.2

Use g_autofree for 'dom_xml' to free it on some of the (unlikely) code paths jumping to cleanup prior to the deallocation which is done right after it's not needed any more since it's a big string. Noticed when running under valgrind: ==2204780== 8,192 bytes in 1 blocks are definitely lost in loss record 2,539 of 2,551 ==2204780== at 0x483BCE8: realloc (vg_replace_malloc.c:834) ==2204780== by 0x4D890DF: g_realloc (in /usr/lib64/libglib-2.0.so.0.6600.4) ==2204780== by 0x4DA3AF0: g_string_append_vprintf (in /usr/lib64/libglib-2.0.so.0.6600.4) ==2204780== by 0x4917293: virBufferAsprintf (virbuffer.c:307) ==2204780== by 0x49B0B75: virDomainChrDefFormat (domain_conf.c:26109) ==2204780== by 0x49E25EF: virDomainDefFormatInternalSetRootName (domain_conf.c:28956) ==2204780== by 0x15F81D24: qemuDomainDefFormatBufInternal (qemu_domain.c:6204) ==2204780== by 0x15F8270D: qemuDomainDefFormatXMLInternal (qemu_domain.c:6229) ==2204780== by 0x15F8270D: qemuDomainDefFormatLive (qemu_domain.c:6279) ==2204780== by 0x15FD8100: qemuMigrationSrcBeginPhase (qemu_migration.c:2395) ==2204780== by 0x15FE0F0D: qemuMigrationSrcPerformPeer2Peer3 (qemu_migration.c:4640) ==2204780== by 0x15FE0F0D: qemuMigrationSrcPerformPeer2Peer (qemu_migration.c:5093) ==2204780== by 0x15FE0F0D: qemuMigrationSrcPerformJob (qemu_migration.c:5168) ==2204780== by 0x15FE280E: qemuMigrationSrcPerform (qemu_migration.c:5372) ==2204780== by 0x15F9BA3D: qemuDomainMigratePerform3Params (qemu_driver.c:11841) Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f44d31c971..37f0d43d24 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4347,7 +4347,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, char *uri_out = NULL; char *cookiein = NULL; char *cookieout = NULL; - char *dom_xml = NULL; + g_autofree char *dom_xml = NULL; int cookieinlen = 0; int cookieoutlen = 0; int ret = -1; -- 2.29.2

The suffix is used for output files of 'storagevolxml2argvtest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testutils.c b/tests/testutils.c index 7ecf7923b8..8734790457 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -332,6 +332,7 @@ virTestRewrapFile(const char *filename) g_autoptr(virCommand) cmd = NULL; if (!(virStringHasSuffix(filename, ".args") || + virStringHasSuffix(filename, ".argv") || virStringHasSuffix(filename, ".ldargs"))) return 0; -- 2.29.2

Use scripts/test-wrap-argv.py to rewrap the output files so that any further changes don't introduce churn since we are rewrapping the output automatically now. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/storagevolxml2argvdata/iso-input.argv | 6 +++-- tests/storagevolxml2argvdata/iso.argv | 4 +++- .../logical-from-qcow2.argv | 6 +++-- tests/storagevolxml2argvdata/luks-cipher.argv | 8 ++++--- .../luks-convert-encrypt.argv | 23 ++++++++++++------- .../luks-convert-encrypt2fileqcow2.argv | 19 ++++++++++----- .../luks-convert-encrypt2fileraw.argv | 20 ++++++++++------ .../luks-convert-qcow2.argv | 21 +++++++++++------ .../storagevolxml2argvdata/luks-convert.argv | 20 ++++++++++------ tests/storagevolxml2argvdata/luks.argv | 8 ++++--- tests/storagevolxml2argvdata/qcow2-1.1.argv | 8 ++++--- .../storagevolxml2argvdata/qcow2-compat.argv | 8 ++++--- .../qcow2-from-logical-compat.argv | 8 ++++--- tests/storagevolxml2argvdata/qcow2-lazy.argv | 9 +++++--- ...ow2-nobacking-convert-prealloc-compat.argv | 10 +++++--- .../qcow2-nobacking-prealloc-compat.argv | 8 ++++--- .../qcow2-nocapacity-convert-prealloc.argv | 9 +++++--- .../qcow2-nocapacity.argv | 6 ++--- .../qcow2-nocow-compat.argv | 9 +++++--- tests/storagevolxml2argvdata/qcow2-nocow.argv | 9 +++++--- .../qcow2-zerocapacity.argv | 5 +++- 21 files changed, 147 insertions(+), 77 deletions(-) diff --git a/tests/storagevolxml2argvdata/iso-input.argv b/tests/storagevolxml2argvdata/iso-input.argv index 1db0265945..203f27ca22 100644 --- a/tests/storagevolxml2argvdata/iso-input.argv +++ b/tests/storagevolxml2argvdata/iso-input.argv @@ -1,2 +1,4 @@ -qemu-img convert -f raw -O raw /var/lib/libvirt/images/test.iso \ -/var/lib/libvirt/images/sparse.img +qemu-img \ +convert \ +-f raw \ +-O raw /var/lib/libvirt/images/test.iso /var/lib/libvirt/images/sparse.img diff --git a/tests/storagevolxml2argvdata/iso.argv b/tests/storagevolxml2argvdata/iso.argv index 172a255eb8..f74505ecec 100644 --- a/tests/storagevolxml2argvdata/iso.argv +++ b/tests/storagevolxml2argvdata/iso.argv @@ -1 +1,3 @@ -qemu-img create -f raw /var/lib/libvirt/images/test.iso 1024K +qemu-img \ +create \ +-f raw /var/lib/libvirt/images/test.iso 1024K diff --git a/tests/storagevolxml2argvdata/logical-from-qcow2.argv b/tests/storagevolxml2argvdata/logical-from-qcow2.argv index 7beded8478..c1b3cef4b9 100644 --- a/tests/storagevolxml2argvdata/logical-from-qcow2.argv +++ b/tests/storagevolxml2argvdata/logical-from-qcow2.argv @@ -1,2 +1,4 @@ -qemu-img convert -f qcow2 -O raw /var/lib/libvirt/images/OtherDemo.img \ -/dev/HostVG/Swap +qemu-img \ +convert \ +-f qcow2 \ +-O raw /var/lib/libvirt/images/OtherDemo.img /dev/HostVG/Swap diff --git a/tests/storagevolxml2argvdata/luks-cipher.argv b/tests/storagevolxml2argvdata/luks-cipher.argv index a8a19f03ff..bb4438949c 100644 --- a/tests/storagevolxml2argvdata/luks-cipher.argv +++ b/tests/storagevolxml2argvdata/luks-cipher.argv @@ -1,5 +1,7 @@ -qemu-img create -f luks \ +qemu-img \ +create \ +-f luks \ --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \ -o key-secret=LuksDemo.img_encrypt0,cipher-alg=serpent-256,cipher-mode=cbc,\ -hash-alg=sha256,ivgen-alg=plain64,ivgen-hash-alg=sha256 \ -/var/lib/libvirt/images/LuksDemo.img 5242880K +hash-alg=sha256,ivgen-alg=plain64,\ +ivgen-hash-alg=sha256 /var/lib/libvirt/images/LuksDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv index 78bce96aaa..456ae621d1 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv @@ -1,11 +1,18 @@ -qemu-img create -f luks \ +qemu-img \ +create \ +-f luks \ --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \ --o key-secret=LuksDemo.img_encrypt0 \ -/var/lib/libvirt/images/LuksDemo.img 5242880K -qemu-img convert --image-opts -n --target-image-opts \ +-o key-secret=LuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img \ +5242880K +qemu-img \ +convert \ +--image-opts \ +-n \ +--target-image-opts \ --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \ ---object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \ -driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=OtherDemo.img_encrypt0 \ -driver=luks,file.filename=/var/lib/libvirt/images/LuksDemo.img,\ +--object secret,id=OtherDemo.img_encrypt0,\ +file=/path/to/inputSecretFile driver=luks,\ +file.filename=/var/lib/libvirt/images/OtherDemo.img,\ +key-secret=OtherDemo.img_encrypt0 driver=luks,\ +file.filename=/var/lib/libvirt/images/LuksDemo.img,\ key-secret=LuksDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv index fd974f863e..1320e2ee2f 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,14 @@ -qemu-img create -f qcow2 \ +qemu-img \ +create \ +-f qcow2 \ -o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K -qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \ -driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=OtherDemo.img_encrypt0 \ -driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img +qemu-img \ +convert \ +--image-opts \ +-n \ +--target-image-opts \ +--object secret,id=OtherDemo.img_encrypt0,\ +file=/path/to/inputSecretFile driver=luks,\ +file.filename=/var/lib/libvirt/images/OtherDemo.img,\ +key-secret=OtherDemo.img_encrypt0 driver=qcow2,\ +file.filename=/var/lib/libvirt/images/sparse-qcow2.img diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv index 82473db57b..e140850217 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv @@ -1,7 +1,13 @@ -qemu-img create -f raw \ -/var/lib/libvirt/images/sparse.img 1073741824K -qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=OtherDemo.img_encrypt0,file=/path/to/inputSecretFile \ -driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=OtherDemo.img_encrypt0 \ -driver=raw,file.filename=/var/lib/libvirt/images/sparse.img +qemu-img \ +create \ +-f raw /var/lib/libvirt/images/sparse.img 1073741824K +qemu-img \ +convert \ +--image-opts \ +-n \ +--target-image-opts \ +--object secret,id=OtherDemo.img_encrypt0,\ +file=/path/to/inputSecretFile driver=luks,\ +file.filename=/var/lib/libvirt/images/OtherDemo.img,\ +key-secret=OtherDemo.img_encrypt0 driver=raw,\ +file.filename=/var/lib/libvirt/images/sparse.img diff --git a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv index 9124f5f27c..78cd9a2a8d 100644 --- a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv @@ -1,9 +1,16 @@ -qemu-img create -f luks \ +qemu-img \ +create \ +-f luks \ --object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \ --o key-secret=OtherDemo.img_encrypt0 \ -/var/lib/libvirt/images/OtherDemo.img 5242880K -qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \ -driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img \ -driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\ +-o key-secret=OtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.img \ +5242880K +qemu-img \ +convert \ +--image-opts \ +-n \ +--target-image-opts \ +--object secret,id=OtherDemo.img_encrypt0,\ +file=/path/to/secretFile driver=qcow2,\ +file.filename=/var/lib/libvirt/images/sparse-qcow2.img driver=luks,\ +file.filename=/var/lib/libvirt/images/OtherDemo.img,\ key-secret=OtherDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks-convert.argv b/tests/storagevolxml2argvdata/luks-convert.argv index 6bac814300..e4a8277d7f 100644 --- a/tests/storagevolxml2argvdata/luks-convert.argv +++ b/tests/storagevolxml2argvdata/luks-convert.argv @@ -1,9 +1,15 @@ -qemu-img create -f luks \ +qemu-img \ +create \ +-f luks \ --object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \ --o key-secret=OtherDemo.img_encrypt0 \ -/var/lib/libvirt/images/OtherDemo.img 5242880K -qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \ -driver=raw,file.filename=/var/lib/libvirt/images/sparse.img \ -driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\ +-o key-secret=OtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.img \ +5242880K +qemu-img \ +convert \ +--image-opts \ +-n \ +--target-image-opts \ +--object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile driver=raw,\ +file.filename=/var/lib/libvirt/images/sparse.img driver=luks,\ +file.filename=/var/lib/libvirt/images/OtherDemo.img,\ key-secret=OtherDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks.argv b/tests/storagevolxml2argvdata/luks.argv index 336238ecab..5013c8ca7f 100644 --- a/tests/storagevolxml2argvdata/luks.argv +++ b/tests/storagevolxml2argvdata/luks.argv @@ -1,4 +1,6 @@ -qemu-img create -f luks \ +qemu-img \ +create \ +-f luks \ --object secret,id=LuksDemo.img_encrypt0,file=/path/to/secretFile \ --o key-secret=LuksDemo.img_encrypt0 \ -/var/lib/libvirt/images/LuksDemo.img 5242880K +-o key-secret=LuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-1.1.argv b/tests/storagevolxml2argvdata/qcow2-1.1.argv index 71ff67378e..5ee974afe9 100644 --- a/tests/storagevolxml2argvdata/qcow2-1.1.argv +++ b/tests/storagevolxml2argvdata/qcow2-1.1.argv @@ -1,3 +1,5 @@ -qemu-img create -f qcow2 -b /dev/null \ --o backing_fmt=raw,compat=1.1 \ -/var/lib/libvirt/images/OtherDemo.img 5242880K +qemu-img \ +create \ +-f qcow2 \ +-b /dev/null \ +-o backing_fmt=raw,compat=1.1 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv index fcb6bed782..3071d7a790 100644 --- a/tests/storagevolxml2argvdata/qcow2-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -1,3 +1,5 @@ -qemu-img create -f qcow2 -b /dev/null \ --o backing_fmt=raw,compat=0.10 \ -/var/lib/libvirt/images/OtherDemo.img 5242880K +qemu-img \ +create \ +-f qcow2 \ +-b /dev/null \ +-o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv index f99717ad40..1971da200d 100644 --- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -1,3 +1,5 @@ -qemu-img convert -f raw -O qcow2 \ --o compat=0.10 \ -/dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img +qemu-img \ +convert \ +-f raw \ +-O qcow2 \ +-o compat=0.10 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-lazy.argv b/tests/storagevolxml2argvdata/qcow2-lazy.argv index c3c09cefef..2621b01168 100644 --- a/tests/storagevolxml2argvdata/qcow2-lazy.argv +++ b/tests/storagevolxml2argvdata/qcow2-lazy.argv @@ -1,3 +1,6 @@ -qemu-img create -f qcow2 -b /dev/null \ --o backing_fmt=raw,compat=1.1,lazy_refcounts \ -/var/lib/libvirt/images/OtherDemo.img 5242880K +qemu-img \ +create \ +-f qcow2 \ +-b /dev/null \ +-o backing_fmt=raw,compat=1.1,\ +lazy_refcounts /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv index f3e230654b..87489641d5 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv @@ -1,3 +1,7 @@ -qemu-img convert -f raw -O qcow2 \ --o preallocation=metadata,compat=0.10 \ -/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img +qemu-img \ +convert \ +-f raw \ +-O qcow2 \ +-o preallocation=metadata,\ +compat=0.10 /var/lib/libvirt/images/sparse.img \ +/var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv index 841d683965..a883030744 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -1,3 +1,5 @@ -qemu-img create -f qcow2 \ --o preallocation=metadata,compat=0.10 \ -/var/lib/libvirt/images/OtherDemo.img 5242880K +qemu-img \ +create \ +-f qcow2 \ +-o preallocation=metadata,\ +compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv index 22dd9381a4..049d2d73b5 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv @@ -1,4 +1,7 @@ -qemu-img convert -f raw -O qcow2 \ --o preallocation=falloc,compat=0.10 \ -/var/lib/libvirt/images/sparse.img \ +qemu-img \ +convert \ +-f raw \ +-O qcow2 \ +-o preallocation=falloc,\ +compat=0.10 /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv index a922d12042..30bcfb00c7 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv @@ -1,5 +1,5 @@ -qemu-img create \ +qemu-img \ +create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=raw,compat=0.10 \ -/var/lib/libvirt/images/OtherDemo.img +-o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv index 826001f73b..5e327dab0b 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv @@ -1,3 +1,6 @@ -qemu-img create -f qcow2 -b /dev/null \ --o backing_fmt=raw,nocow=on,compat=0.10 \ -/var/lib/libvirt/images/OtherDemo.img 5242880K +qemu-img \ +create \ +-f qcow2 \ +-b /dev/null \ +-o backing_fmt=raw,nocow=on,\ +compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nocow.argv b/tests/storagevolxml2argvdata/qcow2-nocow.argv index e54801c78a..74eaa89835 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocow.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocow.argv @@ -1,3 +1,6 @@ -qemu-img create -f qcow2 -b /dev/null \ --o backing_fmt=raw,encryption=on,nocow=on \ -/var/lib/libvirt/images/OtherDemo.img 5242880K +qemu-img \ +create \ +-f qcow2 \ +-b /dev/null \ +-o backing_fmt=raw,encryption=on,\ +nocow=on /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv index 45894931ae..95dfc65d9b 100644 --- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv @@ -1 +1,4 @@ -qemu-img create -f qcow2 -o compat=0.10 /var/lib/libvirt/images/OtherDemo.img 0K +qemu-img \ +create \ +-f qcow2 \ +-o compat=0.10 /var/lib/libvirt/images/OtherDemo.img 0K -- 2.29.2

Format the new volumes with 'compat=1.1' since the minimum supported qemu version is now 1.5 rather the pre-historic compat=0.10. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/storage/storage_util.c | 2 +- .../storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv | 2 +- tests/storagevolxml2argvdata/qcow2-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv | 2 +- .../qcow2-luks-convert-encrypt2fileqcow2.argv | 2 +- tests/storagevolxml2argvdata/qcow2-luks.argv | 2 +- .../qcow2-nobacking-convert-prealloc-compat.argv | 2 +- .../storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv | 2 +- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocow-compat.argv | 2 +- tests/storagevolxml2argvdata/qcow2-zerocapacity.argv | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index b5adb05826..6d8dd3cc16 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -777,7 +777,7 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInfoDefPtr encinfo, if (info->compat) virBufferAsprintf(&buf, "compat=%s,", info->compat); else if (info->format == VIR_STORAGE_FILE_QCOW2) - virBufferAddLit(&buf, "compat=0.10,"); + virBufferAddLit(&buf, "compat=1.1,"); if (info->features && info->format == VIR_STORAGE_FILE_QCOW2) { if (virBitmapIsBitSet(info->features, diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv index 1320e2ee2f..c313a04fb3 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img \ create \ -f qcow2 \ --o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K +-o compat=1.1 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K qemu-img \ convert \ --image-opts \ diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv index 3071d7a790..5ee974afe9 100644 --- a/tests/storagevolxml2argvdata/qcow2-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -2,4 +2,4 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K +-o backing_fmt=raw,compat=1.1 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv index 1971da200d..dcafffc3a4 100644 --- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -2,4 +2,4 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o compat=0.10 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img +-o compat=1.1 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv index de8aef4233..891746d921 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv @@ -3,7 +3,7 @@ create \ -f qcow2 \ --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \ -o encrypt.format=luks,encrypt.key-secret=OtherDemoLuks.img_encrypt0,\ -compat=0.10 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K +compat=1.1 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K qemu-img \ convert \ --image-opts \ diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv index 517156ca83..fc9c4ab825 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img \ create \ -f qcow2 \ --o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K +-o compat=1.1 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K qemu-img \ convert \ --image-opts \ diff --git a/tests/storagevolxml2argvdata/qcow2-luks.argv b/tests/storagevolxml2argvdata/qcow2-luks.argv index 4b51b374ca..c0568e10e3 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks.argv @@ -5,4 +5,4 @@ create \ --object secret,id=OtherDemoLuks.img_encrypt0,file=/path/to/secretFile \ -o backing_fmt=raw,encrypt.format=luks,\ encrypt.key-secret=OtherDemoLuks.img_encrypt0,\ -compat=0.10 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K +compat=1.1 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv index 87489641d5..c237ab0cc9 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv @@ -3,5 +3,5 @@ convert \ -f raw \ -O qcow2 \ -o preallocation=metadata,\ -compat=0.10 /var/lib/libvirt/images/sparse.img \ +compat=1.1 /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv index a883030744..fa83143b5e 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -2,4 +2,4 @@ qemu-img \ create \ -f qcow2 \ -o preallocation=metadata,\ -compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K +compat=1.1 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv index 049d2d73b5..f62da6fabe 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv @@ -3,5 +3,5 @@ convert \ -f raw \ -O qcow2 \ -o preallocation=falloc,\ -compat=0.10 /var/lib/libvirt/images/sparse.img \ +compat=1.1 /var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv index 30bcfb00c7..d696af60d7 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv @@ -2,4 +2,4 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=raw,compat=0.10 /var/lib/libvirt/images/OtherDemo.img +-o backing_fmt=raw,compat=1.1 /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv index 5e327dab0b..b5d18ccc12 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv @@ -3,4 +3,4 @@ create \ -f qcow2 \ -b /dev/null \ -o backing_fmt=raw,nocow=on,\ -compat=0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K +compat=1.1 /var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv index 95dfc65d9b..bc6e5ee758 100644 --- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv @@ -1,4 +1,4 @@ qemu-img \ create \ -f qcow2 \ --o compat=0.10 /var/lib/libvirt/images/OtherDemo.img 0K +-o compat=1.1 /var/lib/libvirt/images/OtherDemo.img 0K -- 2.29.2

The non-transaction wrapper is useful for code paths which want to delete individual bitmaps or for cleanup after a failed job where we want to attempt to delete every bitmap individually to prevent a failure from cleaning up the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 13 +++++++++++++ src/qemu/qemu_monitor.h | 5 +++++ src/qemu/qemu_monitor_json.c | 24 ++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++++++ tests/qemumonitorjsontest.c | 2 ++ 5 files changed, 50 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 14966d4096..2fb7d6569b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4645,6 +4645,19 @@ qemuMonitorTransactionBitmapRemove(virJSONValuePtr actions, } +int +qemuMonitorBitmapRemove(qemuMonitorPtr mon, + const char *node, + const char *name) +{ + VIR_DEBUG("node='%s', name='%s'", node, name); + + QEMU_CHECK_MONITOR(mon); + + return qemuMonitorJSONBitmapRemove(mon, node, name); +} + + int qemuMonitorTransactionBitmapEnable(virJSONValuePtr actions, const char *node, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 7a039641ba..544611b443 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1478,6 +1478,11 @@ int qemuMonitorTransactionBitmapRemove(virJSONValuePtr actions, const char *node, const char *name); + +int +qemuMonitorBitmapRemove(qemuMonitorPtr mon, + const char *node, + const char *name); int qemuMonitorTransactionBitmapEnable(virJSONValuePtr actions, const char *node, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 65c30e3bb4..f19bb589b2 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -9253,6 +9253,30 @@ qemuMonitorJSONTransactionBitmapRemove(virJSONValuePtr actions, } +int +qemuMonitorJSONBitmapRemove(qemuMonitorPtr mon, + const char *node, + const char *name) +{ + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; + + if (!(cmd = qemuMonitorJSONMakeCommand("block-dirty-bitmap-remove", + "s:node", node, + "s:name", name, + NULL))) + return -1; + + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + return -1; + + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + return -1; + + return 0; +} + + int qemuMonitorJSONTransactionBitmapEnable(virJSONValuePtr actions, const char *node, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index ba1531fee8..8e2ab24a59 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -659,6 +659,12 @@ int qemuMonitorJSONTransactionBitmapRemove(virJSONValuePtr actions, const char *node, const char *name); + +int +qemuMonitorJSONBitmapRemove(qemuMonitorPtr mon, + const char *node, + const char *name); + int qemuMonitorJSONTransactionBitmapEnable(virJSONValuePtr actions, const char *node, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 956423f10f..af02c0b0e6 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1215,6 +1215,7 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockdevTrayOpen, "foodev", true) GEN_TEST_FUNC(qemuMonitorJSONBlockdevTrayClose, "foodev") GEN_TEST_FUNC(qemuMonitorJSONBlockdevMediumRemove, "foodev") GEN_TEST_FUNC(qemuMonitorJSONBlockdevMediumInsert, "foodev", "newnode") +GEN_TEST_FUNC(qemuMonitorJSONBitmapRemove, "foodev", "newnode") GEN_TEST_FUNC(qemuMonitorJSONJobDismiss, "jobname") GEN_TEST_FUNC(qemuMonitorJSONJobCancel, "jobname", false) GEN_TEST_FUNC(qemuMonitorJSONJobComplete, "jobname") @@ -3132,6 +3133,7 @@ mymain(void) DO_TEST_GEN(qemuMonitorJSONBlockdevTrayClose); DO_TEST_GEN(qemuMonitorJSONBlockdevMediumRemove); DO_TEST_GEN(qemuMonitorJSONBlockdevMediumInsert); + DO_TEST_GEN(qemuMonitorJSONBitmapRemove); DO_TEST_GEN(qemuMonitorJSONJobDismiss); DO_TEST_GEN(qemuMonitorJSONJobCancel); DO_TEST_GEN(qemuMonitorJSONJobComplete); -- 2.29.2

There's no need in the cleanup steps to invoke a transaction to delete a single bitmap. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_blockjob.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 582fe45c66..aa065b1319 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1420,7 +1420,6 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - g_autoptr(virJSONValue) actions = virJSONValueNewArray(); virDomainDiskDefPtr disk = job->disk; VIR_DEBUG("active commit job '%s' on VM '%s' failed", job->name, vm->def->name); @@ -1428,13 +1427,12 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver, if (!disk) return; - ignore_value(qemuMonitorTransactionBitmapRemove(actions, disk->mirror->nodeformat, - "libvirt-tmp-activewrite")); - if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) return; - qemuMonitorTransaction(priv->mon, &actions); + qemuMonitorBitmapRemove(priv->mon, + disk->mirror->nodeformat, + "libvirt-tmp-activewrite"); if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) return; @@ -1502,7 +1500,6 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriverPtr driver, unsigned long long progressTotal) { g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL; - g_autoptr(virJSONValue) actions = NULL; qemuBackupNotifyBlockjobEnd(vm, job->disk, newstate, job->errmsg, progressCurrent, progressTotal, asyncJob); @@ -1511,23 +1508,16 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriverPtr driver, !(backend = qemuBlockStorageSourceDetachPrepare(job->data.backup.store, NULL))) return; - if (job->data.backup.bitmap) { - actions = virJSONValueNewArray(); - - if (qemuMonitorTransactionBitmapRemove(actions, - job->disk->src->nodeformat, - job->data.backup.bitmap) < 0) - return; - } - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return; if (backend) qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), backend); - if (actions) - qemuMonitorTransaction(qemuDomainGetMonitor(vm), &actions); + if (job->data.backup.bitmap) + qemuMonitorBitmapRemove(qemuDomainGetMonitor(vm), + job->disk->src->nodeformat, + job->data.backup.bitmap); if (qemuDomainObjExitMonitor(driver, vm) < 0) return; -- 2.29.2

Add the migration capability flag and the propagation of the corresponding mapping configuration. The mapping will be produced from the bitmaps on disk depending on both sides of the migration and the necessity to perform merges. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration_params.c | 24 ++++++++++++++++++++++++ src/qemu/qemu_migration_params.h | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 510dad783a..8f491e0ed2 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -63,6 +63,7 @@ struct _qemuMigrationParams { unsigned long long compMethods; /* bit-wise OR of qemuMigrationCompressMethod */ virBitmapPtr caps; qemuMigrationParamValue params[QEMU_MIGRATION_PARAM_LAST]; + virJSONValuePtr blockDirtyBitmapMapping; }; typedef enum { @@ -89,6 +90,7 @@ VIR_ENUM_IMPL(qemuMigrationCapability, "pause-before-switchover", "late-block-activate", "multifd", + "dirty-bitmaps", ); @@ -265,6 +267,7 @@ qemuMigrationParamsFree(qemuMigrationParamsPtr migParams) } virBitmapFree(migParams->caps); + virJSONValueFree(migParams->blockDirtyBitmapMapping); g_free(migParams); } @@ -524,6 +527,20 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params, } +void +qemuMigrationParamsSetBlockDirtyBitmapMapping(qemuMigrationParamsPtr migParams, + virJSONValuePtr *params) +{ + virJSONValueFree(migParams->blockDirtyBitmapMapping); + migParams->blockDirtyBitmapMapping = g_steal_pointer(params); + + if (migParams->blockDirtyBitmapMapping) + ignore_value(virBitmapSetBit(migParams->caps, QEMU_MIGRATION_CAP_BLOCK_DIRTY_BITMAPS)); + else + ignore_value(virBitmapClearBit(migParams->caps, QEMU_MIGRATION_CAP_BLOCK_DIRTY_BITMAPS)); +} + + qemuMigrationParamsPtr qemuMigrationParamsFromFlags(virTypedParameterPtr params, int nparams, @@ -747,6 +764,12 @@ qemuMigrationParamsToJSON(qemuMigrationParamsPtr migParams) return NULL; } + if (migParams->blockDirtyBitmapMapping && + virJSONValueObjectAppend(params, "block-bitmap-mapping", + migParams->blockDirtyBitmapMapping) < 0) + return NULL; + migParams->blockDirtyBitmapMapping = NULL; + return g_steal_pointer(¶ms); } @@ -1202,6 +1225,7 @@ qemuMigrationParamsReset(virQEMUDriverPtr driver, goto cleanup; qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags); + /* We don't reset 'block-bitmap-mapping' as it can't be unset */ cleanup: virErrorRestore(&err); diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 9876101bfc..f1db42ce94 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -39,6 +39,7 @@ typedef enum { QEMU_MIGRATION_CAP_PAUSE_BEFORE_SWITCHOVER, QEMU_MIGRATION_CAP_LATE_BLOCK_ACTIVATE, QEMU_MIGRATION_CAP_MULTIFD, + QEMU_MIGRATION_CAP_BLOCK_DIRTY_BITMAPS, QEMU_MIGRATION_CAP_LAST } qemuMigrationCapability; @@ -132,6 +133,10 @@ qemuMigrationParamsGetULL(qemuMigrationParamsPtr migParams, qemuMigrationParam param, unsigned long long *value); +void +qemuMigrationParamsSetBlockDirtyBitmapMapping(qemuMigrationParamsPtr migParams, + virJSONValuePtr *params); + int qemuMigrationParamsCheck(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.29.2