From: Jesse Cook <code.crashenx@gmail.com>
Date: Mon, 28 Mar 2011 01:30:14 +0000 (-0500)
Subject: Allow relative path for qemu backing file
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=33da939b0f3bfbbfac8a301248d6943e7c459d68;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Allow relative path for qemu backing file

This patch enables the relative backing file path support provided by
qemu-img create.

If a relative path is specified for the backing file, it is converted
to an absolute path using the storage pool path. The absolute path is
used to verify that the backing file exists. If the backing file exists,
the relative path is allowed and will be provided to qemu-img create.
---

diff --git a/AUTHORS b/AUTHORS
index 19abaf115..821cd3961 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -164,6 +164,7 @@ Patches have also been contributed by:
   Tiziano Mueller      <dev-zero@gentoo.org>
   Thibault VINCENT     <thibault.vincent@smartjog.com>
   Naoya Horiguchi      <n-horiguchi@ah.jp.nec.com>
+  Jesse Cook           <code.crashenx@gmail.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 9b7bcc46b..8af2878be 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -692,6 +692,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
     }
 
     if (vol->backingStore.path) {
+        int accessRetCode = -1;
+        char *absolutePath = NULL;
 
         /* XXX: Not strictly required: qemu-img has an option a different
          * backing store, not really sure what use it serves though, and it
@@ -712,7 +714,20 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
                                   vol->backingStore.format);
             return -1;
         }
-        if (access(vol->backingStore.path, R_OK) != 0) {
+
+        /* Convert relative backing store paths to absolute paths for access
+         * validation.
+         */
+        if ('/' != *(vol->backingStore.path) &&
+            virAsprintf(&absolutePath, "%s/%s", pool->def->target.path,
+                        vol->backingStore.path) < 0) {
+            virReportOOMError();
+            return -1;
+        }
+        accessRetCode = access(absolutePath ? absolutePath
+                               : vol->backingStore.path, R_OK);
+        VIR_FREE(absolutePath);
+        if (accessRetCode != 0) {
             virReportSystemError(errno,
                                  _("inaccessible backing store volume %s"),
                                  vol->backingStore.path);