Changeset 79742 in vbox for trunk/src/VBox/Main/src-server/MediumImpl.cpp

Timestamp:

Jul 12, 2019 4:11:19 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132104

Message:

Changes per #5899 / Comment #14

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -847 +847 @@
     m->vdIfConfig.pfnQuerySize = i_vdConfigQuerySize;
     m->vdIfConfig.pfnQuery = i_vdConfigQuery;
+    m->vdIfConfig.pfnUpdate = i_vdConfigUpdate;
     m->vdIfConfig.pfnQueryBytes = NULL;
 
@@ -4674 +4675 @@
             const Utf8Str &name = it->first;
             const Utf8Str &value = it->second;
-            /* do NOT store the plain InitiatorSecret */
-            if (   !fHaveInitiatorSecretEncrypted
-                || !name.equals("InitiatorSecret"))
-                data.properties[name] = value;
-        }
+            bool fCreateOnly = false;
+            for (MediumFormat::PropertyArray::const_iterator itf = m->formatObj->i_getProperties().begin();
+                 itf != m->formatObj->i_getProperties().end();
+                 ++itf)
+             {
+                if (itf->strName.equals(name) &&
+                    (itf->flags & VD_CFGKEY_CREATEONLY))
+                {
+                        fCreateOnly = true;
+                        break;
+                }
+            }
+            if (!fCreateOnly)
+                /* do NOT store the plain InitiatorSecret */
+                if (   !fHaveInitiatorSecretEncrypted
+                    || !name.equals("InitiatorSecret"))
+                            data.properties[name] = value;        }
     }
     if (fHaveInitiatorSecretEncrypted)
@@ -8018 +8031 @@
     memcpy(pszValue, psz, cch + 1);
     return VINF_SUCCESS;
+}
+
+DECLCALLBACK(int) Medium::i_vdConfigUpdate(void *pvUser,
+                                                bool fCreate,
+                                                const char *pszName,
+                                                const char *pszValue)
+{
+    int rv = VINF_SUCCESS;
+    Utf8Str pName = Utf8Str(pszName);
+    Medium *that = (Medium *)pvUser;
+    AutoWriteLock mlock(that COMMA_LOCKVAL_SRC_POS);
+    settings::StringsMap::const_iterator it = that->m->mapProperties.find(pName);
+    if (it == that->m->mapProperties.end() && !fCreate)
+        rv = VERR_CFGM_VALUE_NOT_FOUND;
+    else
+        that->m->mapProperties[pName] = Utf8Str(pszValue);
+    mlock.release();
+    return rv;
 }