util: virstoragefile: Don't mangle data stored about directories

Don't remove detected metadata about directory based storage volumes.

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index eb892680b151b519efc6010911d7dfbadd76acb3..a716b5d743d4fbdf0d0b4bde609b7b2e0c40deee 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1043,11 +1043,8 @@ virStorageFileGetMetadataFromFDInternal(virStorageSourcePtr meta,
     }
 
     if (S_ISDIR(sb.st_mode)) {
-        /* No header to probe for directories, but also no backing
-         * file; therefore, no inclusion loop is possible, and we
-         * don't need canonName or relDir.  */
-        VIR_FREE(meta->relDir);
-        VIR_FREE(meta->path);
+        /* No header to probe for directories, but also no backing file. Just
+         * update the metadata.*/
         meta->type = VIR_STORAGE_TYPE_DIR;
         meta->format = VIR_STORAGE_FILE_DIR;
         ret = 0;

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 19f3f58990c66cd20a14e747122d558c9ed67ccd..370b8c21cf4b1d8785894812a689f22753a04a99 100644 (file)
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -709,6 +709,9 @@ mymain(void)
     testFileData dir = {
         .pathRel = "dir",
         .pathAbs = absdir,
+        .path = canondir,
+        .relDirRel = ".",
+        .relDirAbs = datadir,
         .type = VIR_STORAGE_TYPE_DIR,
         .format = VIR_STORAGE_FILE_DIR,
     };