From: Eric Blake <eblake@redhat.com>
Date: Thu, 14 Apr 2011 16:35:42 +0000 (-0600)
Subject: phyp: avoid a logic bug
X-Git-Tag: v0.9.1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef6147c40edda8e9bfac5dcf0b794731c33542fb;p=thirdparty%2Flibvirt.git

phyp: avoid a logic bug

Ever since commit ebc46f, the destroy function built two command
variants but only used one.  I went with the variant that matches
the idiom used in the counterpart of phypBuildStoragePool.

* src/phyp/phyp_driver.c (phypDestroyStoragePool): Avoid
clobbering cmd.  Fix error message typo.
---

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 5742d957ef..7aa494d84a 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -2936,19 +2936,10 @@ phypDestroyStoragePool(virStoragePoolPtr pool)
         return -1;
     }
     cmd = virBufferContentAndReset(&buf);
-
-    if (virAsprintf(&cmd,
-                    "viosvrcmd -m %s --id %d -c "
-                    "'rmsp %s'", managed_system, vios_id,
-                    pool->name) < 0) {
-        virReportOOMError();
-        goto cleanup;
-    }
-
     ret = phypExec(session, cmd, &exit_status, conn);
 
     if (exit_status < 0) {
-        VIR_ERROR(_("Unable to create Storage Pool: %s"), ret);
+        VIR_ERROR(_("Unable to destroy Storage Pool: %s"), ret);
         goto cleanup;
     }