conf: delete useless backingStoreIsFile field

Finally starting to prune away some of the old fields that have
been made redundant by the new fields, on my way towards directly
reusing virStorageSource.

* src/util/virstoragefile.h (_virStorageFileMetadata): Drop
field.
* src/util/virstoragefile.c (virStorageFileGetMetadataInternal)
(virStorageFileChainLookup): Adjust callers.
* tests/virstoragetest.c (_testFileData, testStorageChain)
(mymain): Simplify test.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index c647a14ef35012c9a1cc04f7362b749d34f06368..bc5d7631e3bd1216af33c319d2e6f0d7ba5d6bba 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -866,14 +866,12 @@ virStorageFileGetMetadataInternal(const char *path,
         if (store == BACKING_STORE_ERROR)
             goto cleanup;
 
-        meta->backingStoreIsFile = false;
         if (backing != NULL) {
             if (VIR_STRDUP(meta->backingStore, backing) < 0) {
                 VIR_FREE(backing);
                 goto cleanup;
             }
             if (virStorageIsFile(backing)) {
-                meta->backingStoreIsFile = true;
                 meta->backingStoreRaw = meta->backingStore;
                 meta->backingStore = NULL;
                 if (virFindBackingFile(directory, backing,
@@ -882,7 +880,6 @@ virStorageFileGetMetadataInternal(const char *path,
                     /* the backing file is (currently) unavailable, treat this
                      * file as standalone:
                      * backingStoreRaw is kept to mark broken image chains */
-                    meta->backingStoreIsFile = false;
                     backingFormat = VIR_STORAGE_FILE_NONE;
                     VIR_WARN("Backing file '%s' of image '%s' is missing.",
                              meta->backingStoreRaw, path);
@@ -1570,7 +1567,7 @@ virStorageFileChainLookup(virStorageFileMetadataPtr chain, const char *start,
         } else if (STREQ_NULLABLE(name, owner->backingStoreRaw) ||
                    STREQ(name, owner->backingStore)) {
             break;
-        } else if (owner->backingStoreIsFile) {
+        } else if (virStorageIsFile(owner->backingStore)) {
             char *absName = NULL;
             if (virFindBackingFile(owner->directory, name,
                                    NULL, &absName) < 0)

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 6c08c3115c1b79cc45a7dd9ff93267ee24fbfecb..4da160b7a3bbce06161fb911572ba724a45152f7 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -148,7 +148,6 @@ struct _virStorageFileMetadata {
     char *backingStore; /* Canonical name (absolute file, or protocol). Should be same as backingMeta->canonPath */
     char *directory; /* The directory containing basename of backingStoreRaw. Should be same as backingMeta->relDir */
     int backingStoreFormat; /* enum virStorageFileFormat. Should be same as backingMeta->format */
-    bool backingStoreIsFile; /* Should be same as backingMeta->type < VIR_STORAGE_TYPE_NETWORK */
 };
 
 

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 3155912ca52ba8500d496efef13eb40703a11015..26f235b3e4378388e7a72361726e6736c65eda99 100644 (file)
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -236,7 +236,6 @@ struct _testFileData
     const char *expBackingDirRel;
     const char *expBackingDirAbs;
     enum virStorageFileFormat expBackingFormat;
-    bool expIsFile;
     unsigned long long expCapacity;
     bool expEncrypted;
     const char *pathRel;
@@ -329,13 +328,12 @@ testStorageChain(const void *args)
         expRelDir = isAbs ? data->files[i]->relDirAbs
             : data->files[i]->relDirRel;
         if (virAsprintf(&expect,
-                        "store:%s\nraw:%s\ndirectory:%s\nother:%d %d %lld %d\n"
+                        "store:%s\nraw:%s\ndirectory:%s\nother:%d %lld %d\n"
                         "path:%s\ncanon:%s\nrelDir:%s\ntype:%d %d\n",
                         NULLSTR(data->files[i]->expBackingStore),
                         NULLSTR(data->files[i]->expBackingStoreRaw),
                         NULLSTR(expBackingDirectory),
                         data->files[i]->expBackingFormat,
-                        data->files[i]->expIsFile,
                         data->files[i]->expCapacity,
                         data->files[i]->expEncrypted,
                         NULLSTR(expPath),
@@ -344,12 +342,12 @@ testStorageChain(const void *args)
                         data->files[i]->type,
                         data->files[i]->format) < 0 ||
             virAsprintf(&actual,
-                        "store:%s\nraw:%s\ndirectory:%s\nother:%d %d %lld %d\n"
+                        "store:%s\nraw:%s\ndirectory:%s\nother:%d %lld %d\n"
                         "path:%s\ncanon:%s\nrelDir:%s\ntype:%d %d\n",
                         NULLSTR(elt->backingStore),
                         NULLSTR(elt->backingStoreRaw),
                         NULLSTR(elt->directory),
-                        elt->backingStoreFormat, elt->backingStoreIsFile,
+                        elt->backingStoreFormat,
                         elt->capacity, !!elt->encryption,
                         NULLSTR(elt->path),
                         NULLSTR(elt->canonPath),
@@ -461,7 +459,6 @@ mymain(void)
         .expBackingDirRel = ".",
         .expBackingDirAbs = datadir,
         .expBackingFormat = VIR_STORAGE_FILE_RAW,
-        .expIsFile = true,
         .expCapacity = 1024,
         .pathRel = "qcow2",
         .pathAbs = canonqcow2,
@@ -523,7 +520,6 @@ mymain(void)
         .expBackingDirRel = datadir,
         .expBackingDirAbs = datadir,
         .expBackingFormat = VIR_STORAGE_FILE_QCOW2,
-        .expIsFile = true,
         .expCapacity = 1024,
         .pathRel = "wrap",
         .pathAbs = abswrap,
@@ -565,7 +561,6 @@ mymain(void)
         .expBackingDirRel = datadir,
         .expBackingDirAbs = datadir,
         .expBackingFormat = VIR_STORAGE_FILE_RAW,
-        .expIsFile = true,
         .expCapacity = 1024,
         .pathRel = "wrap",
         .pathAbs = abswrap,
@@ -591,7 +586,6 @@ mymain(void)
     qcow2.expBackingStore = NULL;
     qcow2.expBackingStoreRaw = datadir "/bogus";
     qcow2.expBackingFormat = VIR_STORAGE_FILE_NONE;
-    qcow2.expIsFile = false;
     qcow2.pathRel = "qcow2";
     qcow2.relDirRel = ".";
 
@@ -650,7 +644,6 @@ mymain(void)
         .expBackingDirRel = datadir,
         .expBackingDirAbs = datadir,
         .expBackingFormat = VIR_STORAGE_FILE_RAW,
-        .expIsFile = true,
         .expCapacity = 1024,
         .pathRel = "qed",
         .pathAbs = absqed,
@@ -717,7 +710,6 @@ mymain(void)
         .expBackingDirRel = "sub/../sub/..",
         .expBackingDirAbs = datadir "/sub/../sub/..",
         .expBackingFormat = VIR_STORAGE_FILE_RAW,
-        .expIsFile = true,
         .expCapacity = 1024,
         .pathRel = "../sub/link1",
         .pathAbs = "../sub/link1",
@@ -733,7 +725,6 @@ mymain(void)
         .expBackingDirRel = "sub/../sub",
         .expBackingDirAbs = datadir "/sub/../sub",
         .expBackingFormat = VIR_STORAGE_FILE_QCOW2,
-        .expIsFile = true,
         .expCapacity = 1024,
         .pathRel = "sub/link2",
         .pathAbs = abslink2,
@@ -765,7 +756,6 @@ mymain(void)
     qcow2.expBackingDirRel = ".";
     qcow2.expBackingDirAbs = datadir;
     qcow2.expBackingFormat= VIR_STORAGE_FILE_NONE;
-    qcow2.expIsFile = true;
 
     /* Behavior of an infinite loop chain */
     TEST_CHAIN(16, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,