forked from rpms/libvirt
72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
From b28ebb2480fb205ff10059a04745ff989d4f04b0 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <b28ebb2480fb205ff10059a04745ff989d4f04b0@dist-git>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 16 Mar 2020 22:11:38 +0100
|
|
Subject: [PATCH] qemu: capabilities: Introduce
|
|
QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The capability is based on qemu's support of using blockdev-snapshot to
|
|
install backing chain also for images which are in use by a block-copy
|
|
job.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
(cherry picked from commit d6498be16565f23750f7e906050bdbc30678101f)
|
|
|
|
Conflicts:
|
|
src/qemu/qemu_capabilities.c
|
|
src/qemu/qemu_capabilities.h
|
|
|
|
QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT not backported
|
|
|
|
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
|
|
|
|
Capability file update not backported
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1803092
|
|
Message-Id: <8240acbad794e65a4e3c61be3fa6713e0cb181ae.1584391726.git.pkrempa@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@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 34df4d89b3..663017157b 100644
|
|
--- a/src/qemu/qemu_capabilities.c
|
|
+++ b/src/qemu/qemu_capabilities.c
|
|
@@ -559,6 +559,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
|
"virtio-net.failover",
|
|
"cpu.kvm-no-adjvtime",
|
|
"vhost-user-fs",
|
|
+ "blockdev-snapshot.allow-write-only-overlay",
|
|
);
|
|
|
|
|
|
@@ -1432,6 +1433,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
|
|
{ "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
|
|
{ "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
|
|
{ "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
|
|
+ { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
|
|
};
|
|
|
|
typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
|
|
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
index e3449a9ca3..2eb8599525 100644
|
|
--- a/src/qemu/qemu_capabilities.h
|
|
+++ b/src/qemu/qemu_capabilities.h
|
|
@@ -540,6 +540,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
|
|
QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */
|
|
QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */
|
|
+ QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
|
|
|
|
QEMU_CAPS_LAST /* this must always be the last item */
|
|
} virQEMUCapsFlags;
|
|
--
|
|
2.25.1
|
|
|