|
 |
404507 |
From 6f750627ca303b962cf2c610b9cd27bae0fc1439 Mon Sep 17 00:00:00 2001
|
|
|
404507 |
Message-Id: <6f750627ca303b962cf2c610b9cd27bae0fc1439@dist-git>
|
|
|
404507 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
404507 |
Date: Thu, 23 Nov 2017 19:02:20 +0100
|
|
|
404507 |
Subject: [PATCH] qemu: snapshot: Disallow snapshot of unsupported shared disks
|
|
|
404507 |
|
|
|
404507 |
Creating a snapshot would introduce a possibly unsupported member for
|
|
|
404507 |
sharing into the backing chain. Add a check to prevent that from
|
|
|
404507 |
happening.
|
|
|
404507 |
|
|
|
404507 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1511480
|
|
|
404507 |
(cherry picked from commit 9b2fbfa6f6b535b9f41a7503531d43d86d7a8868)
|
|
|
404507 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
404507 |
---
|
|
|
404507 |
src/qemu/qemu_driver.c | 24 ++++++++++++++++++++++++
|
|
|
404507 |
1 file changed, 24 insertions(+)
|
|
|
404507 |
|
|
|
404507 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
404507 |
index aa6a326bb4..620028fe07 100644
|
|
|
404507 |
--- a/src/qemu/qemu_driver.c
|
|
|
404507 |
+++ b/src/qemu/qemu_driver.c
|
|
|
404507 |
@@ -13952,6 +13952,24 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn,
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
|
|
|
404507 |
+static int
|
|
|
404507 |
+qemuDomainSnapshotPrepareDiskShared(virDomainSnapshotDiskDefPtr snapdisk,
|
|
|
404507 |
+ virDomainDiskDefPtr domdisk)
|
|
|
404507 |
+{
|
|
|
404507 |
+ if (!domdisk->src->shared || domdisk->src->readonly)
|
|
|
404507 |
+ return 0;
|
|
|
404507 |
+
|
|
|
404507 |
+ if (!qemuBlockStorageSourceSupportsConcurrentAccess(snapdisk->src)) {
|
|
|
404507 |
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
404507 |
+ _("shared access for disk '%s' requires use of "
|
|
|
404507 |
+ "supported storage format"), domdisk->dst);
|
|
|
404507 |
+ return -1;
|
|
|
404507 |
+ }
|
|
|
404507 |
+
|
|
|
404507 |
+ return 0;
|
|
|
404507 |
+}
|
|
|
404507 |
+
|
|
|
404507 |
+
|
|
|
404507 |
static int
|
|
|
404507 |
qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdisk,
|
|
|
404507 |
virDomainDiskDefPtr domdisk)
|
|
|
404507 |
@@ -14014,6 +14032,9 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi
|
|
|
404507 |
return -1;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
+ if (qemuDomainSnapshotPrepareDiskShared(snapdisk, domdisk) < 0)
|
|
|
404507 |
+ return -1;
|
|
|
404507 |
+
|
|
|
404507 |
return 0;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
@@ -14073,6 +14094,9 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk
|
|
|
404507 |
return -1;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
+ if (qemuDomainSnapshotPrepareDiskShared(snapdisk, domdisk) < 0)
|
|
|
404507 |
+ return -1;
|
|
|
404507 |
+
|
|
|
404507 |
return 0;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
--
|
|
|
404507 |
2.15.0
|
|
|
404507 |
|