From: John Ferlan <jferlan@redhat.com>
Date: Fri, 13 Jan 2017 12:34:03 +0000 (-0500)
Subject: storage: Clean up return value checking
X-Git-Tag: v3.0.0-rc2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f462f9ad6e0730a8a98b8da385afa497b0a1671e;p=thirdparty%2Flibvirt.git

storage: Clean up return value checking

Rather than special casing the VIR_STORAGE_BLKID_PROBE_UNKNOWN after
calling virStorageBackendBLKIDFindPart, just allow the switch statement
handle setting ret = -2.
---

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index cf7e68a5cd..79482e6221 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -2777,10 +2777,6 @@ virStorageBackendBLKIDFindEmpty(const char *device,
         rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) {
 
         rc = virStorageBackendBLKIDFindPart(probe, device, format);
-        if (rc == VIR_STORAGE_BLKID_PROBE_UNKNOWN) {
-            ret = -2;
-            goto cleanup;
-        }
     }
 
     switch (rc) {
@@ -2799,10 +2795,7 @@ virStorageBackendBLKIDFindEmpty(const char *device,
         break;
 
     case VIR_STORAGE_BLKID_PROBE_UNKNOWN:
-        virReportError(VIR_ERR_STORAGE_PROBE_FAILED,
-                       _("Not capable of probing for format type '%s', "
-                         "requires build --overwrite"),
-                       format);
+        ret = -2;
         break;
 
     case VIR_STORAGE_BLKID_PROBE_MATCH:
@@ -2829,7 +2822,6 @@ virStorageBackendBLKIDFindEmpty(const char *device,
         ret = -1;
     }
 
- cleanup:
     blkid_free_probe(probe);
 
     return ret;