[libvirt] [PATCH RFC 11/22] storage: Determine the local storage type right away

Peter Krempa pkrempa at redhat.com
Tue May 6 13:37:00 UTC 2014


When walking the backing chain we previously set the storage type to
_FILE and let the virStorageFileGetMetadataFromFDInternal update it to
the correct type later on.

This patch moves the actual storage type determination to the place
where we parse the backing store name so that the code can later be
switched to use virStorageFileReadHeader() directly.
---
 src/storage/storage_driver.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 25772e8..163b402 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -3084,6 +3084,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
 {
     int fd;
     int ret = -1;
+    struct stat st;
     virStorageSourcePtr backingStore = NULL;
     int backingFormat;

@@ -3146,6 +3147,16 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
             ret = 0;
             goto cleanup;
         }
+
+        /* update the type for local storage */
+        if (stat(backingStore->path, &st) == 0) {
+            if (S_ISDIR(st.st_mode)) {
+                backingStore->type = VIR_STORAGE_TYPE_DIR;
+                backingStore->format = VIR_STORAGE_FILE_DIR;
+            } else if (S_ISBLK(st.st_mode)) {
+                backingStore->type = VIR_STORAGE_TYPE_BLOCK;
+            }
+        }
     } else {
         /* TODO: To satisfy the test case, copy the network URI as path. This
          * will be removed later. */
-- 
1.9.2




More information about the libvir-list mailing list