]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix storage format probing
authorJán Tomko <jtomko@redhat.com>
Thu, 5 Jun 2014 16:47:21 +0000 (18:47 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 5 Jun 2014 16:58:58 +0000 (18:58 +0200)
Commit fff74b2 moved the probing into virStorageFileGetMetadataFromBuf
but didn't update the format in volume definition.

https://bugzilla.redhat.com/show_bug.cgi?id=1104908

src/storage/storage_backend_fs.c
src/storage/storage_backend_gluster.c

index 133e059f888fc5205b071083bbe84f5a054d5062..c93fc1e1225b55e4fdf2b53ce74a610530a69244 100644 (file)
@@ -104,6 +104,8 @@ virStorageBackendProbeTarget(virStorageSourcePtr target,
     /* Default to success below this point */
     ret = 0;
 
+    target->format = meta->format;
+
     if (*backingStore &&
         *backingStoreFormat == VIR_STORAGE_FILE_AUTO &&
         virStorageIsFile(*backingStore)) {
index 3db4e66729003521b6c6c6d8b64d7a1d038ae3af..b96d1167ed5236160fce3de20b936c504529053a 100644 (file)
@@ -298,6 +298,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
                                                   &vol->backingStore.format)))
         goto cleanup;
 
+    vol->target.format = meta->format;
     if (vol->backingStore.path &&
         vol->backingStore.format < 0)
         vol->backingStore.format = VIR_STORAGE_FILE_RAW;