Fix FS volume creation with backing stores.

This regressed when CreateXMLFrom was added: we should only perform the
backing store comparison if an input volume was passed.

diff --git a/ChangeLog b/ChangeLog
index 1ef6a4600f138a074abed4c48a91a3a85bec94dc..8dd22edf9d6393cc0ea6a386d45fd2d09c5b3564 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 16 11:43:17 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+       * src/storage_backend_fs.c: Fix FS volume creation with backing stores.
+
 Tue Jun 16 11:33:54 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
        * src/domain_conf.c src/domain_conf.h src/libvirt_private.syms

diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index ac7c4240d497023a0d5c969895e33225e66d2280..0e93e54394ec7d8a93e5af6c9421d5ef8ad8f47c 100644 (file)
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -1251,8 +1251,9 @@ static int createQemuImg(virConnectPtr conn,
          * backing store, not really sure what use it serves though, and it
          * may cause issues with lvm. Untested essentially.
          */
-        if (!inputBackingPath ||
-            !STREQ(inputBackingPath, vol->backingStore.path)) {
+        if (inputvol &&
+            (!inputBackingPath ||
+             STRNEQ(inputBackingPath, vol->backingStore.path))) {
             virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
                                   "%s", _("a different backing store can not "
                                           "be specified."));