From 53d9458b2d6095e376f2b5cacf30da7b2227f69d Mon Sep 17 00:00:00 2001

Message-Id: <53d9458b2d6095e376f2b5cacf30da7b2227f69d@dist-git>

From: Peter Krempa <pkrempa@redhat.com>

Date: Thu, 23 Nov 2017 19:02:13 +0100

Subject: [PATCH] qemu: Move snapshot disk validation functions into one

Move the code so that both the new image and old image can be verified

in the same function.

(cherry picked from commit 8ffdeed455650557df531aafc66c20b31bd4e0c4)

https://bugzilla.redhat.com/show_bug.cgi?id=1511480

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/qemu/qemu_driver.c | 91 ++++++++++++++++++++------------------------------

 1 file changed, 36 insertions(+), 55 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c

index b35ab6d30e..aa6a326bb4 100644

--- a/src/qemu/qemu_driver.c

+++ b/src/qemu/qemu_driver.c

@@ -13953,17 +13953,19 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn,

 static int

-qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)

+qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdisk,

+                                              virDomainDiskDefPtr domdisk)

 {

-    int actualType = virStorageSourceGetActualType(disk->src);

+    int domDiskType = virStorageSourceGetActualType(domdisk->src);

+    int snapDiskType = virStorageSourceGetActualType(snapdisk->src);

-    switch ((virStorageType) actualType) {

+    switch ((virStorageType) domDiskType) {

     case VIR_STORAGE_TYPE_BLOCK:

     case VIR_STORAGE_TYPE_FILE:

-        return 0;

+        break;

     case VIR_STORAGE_TYPE_NETWORK:

-        switch ((virStorageNetProtocol) disk->src->protocol) {

+        switch ((virStorageNetProtocol) domdisk->src->protocol) {

         case VIR_STORAGE_NET_PROTOCOL_NONE:

         case VIR_STORAGE_NET_PROTOCOL_NBD:

         case VIR_STORAGE_NET_PROTOCOL_RBD:

@@ -13981,7 +13983,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)

             virReportError(VIR_ERR_INTERNAL_ERROR,

                            _("external inactive snapshots are not supported on "

                              "'network' disks using '%s' protocol"),

-                           virStorageNetProtocolTypeToString(disk->src->protocol));

+                           virStorageNetProtocolTypeToString(domdisk->src->protocol));

             return -1;

         }

         break;

@@ -13992,7 +13994,23 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)

     case VIR_STORAGE_TYPE_LAST:

         virReportError(VIR_ERR_INTERNAL_ERROR,

                        _("external inactive snapshots are not supported on "

-                         "'%s' disks"), virStorageTypeToString(actualType));

+                         "'%s' disks"), virStorageTypeToString(domDiskType));

+        return -1;

+    }

+

+    switch ((virStorageType) snapDiskType) {

+    case VIR_STORAGE_TYPE_BLOCK:

+    case VIR_STORAGE_TYPE_FILE:

+        break;

+

+    case VIR_STORAGE_TYPE_NETWORK:

+    case VIR_STORAGE_TYPE_DIR:

+    case VIR_STORAGE_TYPE_VOLUME:

+    case VIR_STORAGE_TYPE_NONE:

+    case VIR_STORAGE_TYPE_LAST:

+        virReportError(VIR_ERR_INTERNAL_ERROR,

+                       _("external inactive snapshots are not supported on "

+                         "'%s' disks"), virStorageTypeToString(snapDiskType));

         return -1;

     }

@@ -14001,33 +14019,27 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)

 static int

-qemuDomainSnapshotPrepareDiskExternalBackingActive(virDomainDiskDefPtr disk)

+qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk,

+                                            virDomainDiskDefPtr domdisk)

 {

-    if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {

+    int actualType = virStorageSourceGetActualType(snapdisk->src);

+

+    if (domdisk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {

         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

                        _("external active snapshots are not supported on scsi "

                          "passthrough devices"));

         return -1;

     }

-    return 0;

-}

-

-

-static int

-qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr disk)

-{

-    int actualType = virStorageSourceGetActualType(disk->src);

-

     switch ((virStorageType) actualType) {

     case VIR_STORAGE_TYPE_BLOCK:

     case VIR_STORAGE_TYPE_FILE:

-        return 0;

+        break;

     case VIR_STORAGE_TYPE_NETWORK:

-        switch ((virStorageNetProtocol) disk->src->protocol) {

+        switch ((virStorageNetProtocol) snapdisk->src->protocol) {

         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:

-            return 0;

+            break;

         case VIR_STORAGE_NET_PROTOCOL_NONE:

         case VIR_STORAGE_NET_PROTOCOL_NBD:

@@ -14045,7 +14057,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d

             virReportError(VIR_ERR_INTERNAL_ERROR,

                            _("external active snapshots are not supported on "

                              "'network' disks using '%s' protocol"),

-                           virStorageNetProtocolTypeToString(disk->src->protocol));

+                           virStorageNetProtocolTypeToString(snapdisk->src->protocol));

             return -1;

         }

@@ -14065,31 +14077,6 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d

 }

-static int

-qemuDomainSnapshotPrepareDiskExternalOverlayInactive(virDomainSnapshotDiskDefPtr disk)

-{

-    int actualType = virStorageSourceGetActualType(disk->src);

-

-    switch ((virStorageType) actualType) {

-    case VIR_STORAGE_TYPE_BLOCK:

-    case VIR_STORAGE_TYPE_FILE:

-        return 0;

-

-    case VIR_STORAGE_TYPE_NETWORK:

-    case VIR_STORAGE_TYPE_DIR:

-    case VIR_STORAGE_TYPE_VOLUME:

-    case VIR_STORAGE_TYPE_NONE:

-    case VIR_STORAGE_TYPE_LAST:

-        virReportError(VIR_ERR_INTERNAL_ERROR,

-                       _("external inactive snapshots are not supported on "

-                         "'%s' disks"), virStorageTypeToString(actualType));

-        return -1;

-    }

-

-    return 0;

-}

-

-

 static int

 qemuDomainSnapshotPrepareDiskExternal(virConnectPtr conn,

                                       virDomainDiskDefPtr disk,

@@ -14107,16 +14094,10 @@ qemuDomainSnapshotPrepareDiskExternal(virConnectPtr conn,

         if (virStorageTranslateDiskSourcePool(conn, disk) < 0)

             return -1;

-        if (qemuDomainSnapshotPrepareDiskExternalBackingInactive(disk) < 0)

-            return -1;

-

-        if (qemuDomainSnapshotPrepareDiskExternalOverlayInactive(snapdisk) < 0)

+        if (qemuDomainSnapshotPrepareDiskExternalInactive(snapdisk, disk) < 0)

             return -1;

     } else {

-        if (qemuDomainSnapshotPrepareDiskExternalBackingActive(disk) < 0)

-            return -1;

-

-        if (qemuDomainSnapshotPrepareDiskExternalOverlayActive(snapdisk) < 0)

+        if (qemuDomainSnapshotPrepareDiskExternalActive(snapdisk, disk) < 0)

             return -1;

     }

-- 

2.15.0