util: storagefile: Track whether a virStorageSource was auto-detected

When formatting an inactive or migratable XML we will need to suppress
backing chain members which were detected from the disk to keep
semantics straight. This means we need to record, whether a
virStorageSource originates from autodetection.

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index bc56da70d0ebca11e8f9737430678f2e7f53f183..d2b21a81693efd5f70441cf037420f8825d91fce 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2060,6 +2060,7 @@ virStorageSourceCopy(const virStorageSource *src,
     ret->haveTLS = src->haveTLS;
     ret->tlsFromConfig = src->tlsFromConfig;
     ret->tlsVerify = src->tlsVerify;
+    ret->detected = src->detected;
 
     /* storage driver metadata are not copied */
     ret->drv = NULL;
@@ -3434,6 +3435,8 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent)
         /* copy parent's labelling and other top level stuff */
         if (virStorageSourceInitChainElement(ret, parent, true) < 0)
             goto error;
+
+        ret->detected = true;
     }
 
     return ret;

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 86e60de2ad6a22ade1440f97ec0ca270f3f7d565..1e36a6671e8b37f418aa0c9412c5750063261a6b 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -296,6 +296,8 @@ struct _virStorageSource {
     char *tlsAlias;
     char *tlsCertdir;
     bool tlsVerify;
+
+    bool detected; /* true if this entry was not provided by the user */
 };