[libvirt] [PATCH 5/5] qemu: capabilities: Always assume disk snapshot caps

'blockdev-snapshot-sync' is present in QEMU since v0.14.0-rc0 and 'transaction' since v1.1.0 (52e7c241ac766406f05fa) Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 9 +-------- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_driver.c | 8 -------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 -- 39 files changed, 3 insertions(+), 90 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3184d5acd1..71d4c01296 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -801,7 +801,6 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, virCapsGuestMachinePtr *machines = NULL; size_t nmachines = 0; int ret = -1; - bool hasdisksnapshot = false; if (!binary) return 0; @@ -831,11 +830,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, if (!virCapabilitiesAddGuestFeature(guest, "deviceboot", true, false)) goto cleanup; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT)) - hasdisksnapshot = true; - - if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnapshot, - false)) + if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", true, false)) goto cleanup; if (virCapabilitiesAddGuestDomain(guest, @@ -958,11 +953,9 @@ struct virQEMUCapsStringFlags { struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { - { "transaction", QEMU_CAPS_TRANSACTION }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-vnc", QEMU_CAPS_VNC }, - { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 129807f482..c6f6980684 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -169,7 +169,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */ QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ - QEMU_CAPS_TRANSACTION, /* transaction monitor command */ + X_QEMU_CAPS_TRANSACTION, /* transaction monitor command */ /* 90 */ X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ @@ -210,7 +210,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */ X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */ X_QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */ - QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ + X_QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ QEMU_CAPS_DEVICE_QXL, /* -device qxl */ /* 120 */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cb8b683c06..14b4e0af1e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15395,14 +15395,6 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, char *compressedpath = NULL; virQEMUSaveDataPtr data = NULL; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DISK_SNAPSHOT) || - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("live disk snapshot not supported with this " - "QEMU binary")); - return -1; - } - /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 737663ad8c..28b2ac25aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index f5abecc417..a93fd7f545 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 91479f56a3..5402c33d3a 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 02e368b0fc..0206a2a314 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index bebd9c12fe..b0a8c01223 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -32,7 +31,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 7a9cad4f2f..463705bd84 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 7a2d70a4a7..a48367eae4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 27e730b65b..105e8840e9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index c9368c0dbe..9919086168 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 9288b0994e..2f306d790b 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index e5e24f67e0..c7e7406a44 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -32,7 +31,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 6b9ccc4715..d23588018a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index ea0b76db48..fc0acdc753 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index a6c7369fd7..6bb5cf0f3f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 4fcfd9c0f3..7fb4d1cd93 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index df28f15b49..7941ceebb6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 323aafcd2f..4841bbdbc5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -34,7 +33,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index aeff5dacd4..d155cc180d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4d145d189c..d682439c38 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index d000d9447f..de8176042b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 83298dfdc1..699b561bfd 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 2045556c32..2826ec3649 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 8811b827b1..c2e90b2e19 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 024c2d4286..8958e4660e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index f56311342d..63be13e61c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 5c5415ddd7..0eca457063 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 4237453e50..0ca74f4785 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 8ded322bd9..01f2b1b5c5 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -4,14 +4,12 @@ <selfvers>0</selfvers> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index e92d9ba335..2f66ae6fbf 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -4,14 +4,12 @@ <selfvers>0</selfvers> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 5bf629164f..08321e1127 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -20,7 +19,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 9f89b384dc..90ab809c91 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 02dbf9ce6d..9ae348d704 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='device-video-primary'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 23389fb95e..d64c68ffa9 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index d6ca1bbef5..348e863528 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -22,7 +22,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -35,7 +34,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index bd7c9dc72d..e5b24ab939 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -22,7 +22,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -35,7 +34,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index de5956b6c3..4585ff9e07 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> -- 2.20.1