Changeset 79742 in vbox

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

Location:

trunk

Files:

• include/VBox/vd-ifs.h (modified) (2 diffs)
• include/VBox/vd.h (modified) (1 diff)
• src/VBox/Main/include/MediumImpl.h (modified) (1 diff)
• src/VBox/Main/src-server/MediumImpl.cpp (modified) (3 diffs)
• src/VBox/Storage/VDI.cpp (modified) (6 diffs)
• src/VBox/Storage/VDICore.h (modified) (1 diff)

trunk/include/VBox/vd-ifs.h

@@ -829 +829 @@
     DECLR3CALLBACKMEMBER(int, pfnQueryBytes, (void *pvUser, const char *pszName, void *ppvData, size_t cbData));
 
+    /**
+     * Set a named property to a specified string value, optionally creating if it doesn't exist.
+     *
+     * @return  VBox status code.
+     *          VERR_CFGM_VALUE_NOT_FOUND means that the key is not known and fCreate flag was not set.
+     * @param   pvUser          The opaque user data associated with this interface.
+     * @param   fCreate         Create property if it doesn't exist (if property exists, it is not an error)
+     * @param   pszName         Name of the key to query.
+     * @param   pszValue        String value to set the name property to.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnUpdate, (void *pvUser, bool fCreate,
+            const char *pszName, const char *pszValue));
+
 } VDINTERFACECONFIG, *PVDINTERFACECONFIG;
 
@@ -1112 +1125 @@
 }
 
+/**
+ * Set property value to string (optionally create if non-existent).
+ *
+ * @return  VBox status code.
+ * @param   pCfgIf      Pointer to configuration callback table.
+ * @param   fCreate     Create the property if it doesn't exist
+ * @param   pszName     Name of property
+ * @param   pszValue    String value to assign to property
+ */
+DECLINLINE(int) VDCFGUpdate(PVDINTERFACECONFIG pCfgIf, bool fCreate, const char *pszName, const char *pszValue)
+{
+    int rc = pCfgIf->pfnUpdate(pCfgIf->Core.pvUser, fCreate, pszName, pszValue);
+    return rc;
+}
+
+/**
+ * Set property value to Unsigned Int 64-bit (optionally create if non-existent).
+ *
+ * @return  VBox status code.
+ * @param   pCfgIf      Pointer to configuration callback table.
+ * @param   fCreate     Create the property if it doesn't exist
+ * @param   pszName     Name of property
+ * @param   pszValue    String value to assign to property
+ */
+
+DECLINLINE(int) VDCFGUpdateU64(PVDINTERFACECONFIG pCfgIf, bool fCreate, const char *pszName, uint64_t u64)
+{
+     char *pszValue;
+     RTStrAPrintf(&pszValue, "%ul", u64);
+     int rc = VDCFGUpdate(pCfgIf, fCreate, pszName, pszValue);
+     RTMemFree(pszValue);
+     return rc;
+}
+
+
+
 /** Forward declaration of a VD socket. */
 typedef struct VDSOCKETINT *VDSOCKET;

trunk/include/VBox/vd.h

@@ -354 +354 @@
  * a good idea, as the average user won't understand it easily. */
 #define VD_CFGKEY_EXPERT            RT_BIT(1)
+/** Key only need at media creation, not to be retained in registry.
+ *  Should not be exposed in the GUI */
+#define VD_CFGKEY_CREATEONLY        RT_BIT(2)
 /** @}*/
 

trunk/src/VBox/Main/include/MediumImpl.h

@@ -350 +350 @@
     static DECLCALLBACK(int) i_vdConfigQuerySize(void *pvUser, const char *pszName,
                                                  size_t *pcbValue);
+    static DECLCALLBACK(int) i_vdConfigUpdate(void *pvUser, bool fCreate,
+                                            const char *pszName, const char *pszValue);
+
     static DECLCALLBACK(int) i_vdConfigQuery(void *pvUser, const char *pszName,
                                              char *pszValue, size_t cchValue);

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;
 }
 

trunk/src/VBox/Storage/VDI.cpp

@@ -44 +44 @@
 static const VDCONFIGINFO vdiConfigInfo[] =
 {
-    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      0 },
+    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      VD_CFGKEY_CREATEONLY },
     { NULL,                             NULL,                             VDCFGVALUETYPE_INTEGER,      0 }
 };
@@ -541 +541 @@
     pImage->uShiftOffset2Index = getPowerOfTwo(getImageBlockSize(&pImage->Header));
     pImage->offStartBlockData  = getImageExtraBlockSize(&pImage->Header);
-    pImage->cbTotalBlockData   =   pImage->offStartBlockData
+    pImage->cbAllocationBlock  = getImageBlockSize(&pImage->Header);
+    pImage->cbTotalBlockData   = pImage->offStartBlockData
                                  + getImageBlockSize(&pImage->Header);
 }
@@ -706 +707 @@
     int rc = VINF_SUCCESS;
     uint32_t cbDataAlign = VDI_DATA_ALIGN;
-    uint32_t cbAllocationBlock = VDI_IMAGE_DEFAULT_BLOCK_SIZE;
     AssertPtr(pPCHSGeometry);
     AssertPtr(pLCHSGeometry);
@@ -723 +723 @@
     if (pImgCfg)
     {
-        rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize", &cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
+        rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize",
+                &pImage->cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
         if (RT_FAILURE(rc))
             rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
@@ -741 +742 @@
 
         rc = vdiSetupImageState(pImage, uImageFlags, pszComment, cbSize,
-                cbAllocationBlock, cbDataAlign, pPCHSGeometry, pLCHSGeometry);
+                pImage->cbAllocationBlock, cbDataAlign, pPCHSGeometry, pLCHSGeometry);
+
         if (RT_SUCCESS(rc))
         {
@@ -1013 +1015 @@
         pRegion->cbMetadata           = 0;
         pRegion->cRegionBlocksOrBytes = getImageDiskSize(&pImage->Header);
+        if (uOpenFlags & VD_OPEN_FLAGS_INFO)
+        {
+            PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(pImage->pVDIfsImage);
+            if (pImgCfg)
+            {
+                rc = VDCFGUpdateU64(pImgCfg, true, "AllocationBlockSize", pImage->cbAllocationBlock);
+                if (RT_FAILURE(rc))
+                    return rc;
+            }
+        }
     }
     else

trunk/src/VBox/Storage/VDICore.h

@@ -554 +554 @@
     /** Total size of image block (including the extra data). */
     unsigned                cbTotalBlockData;
+    /** Allocation Block Size */
+    unsigned                cbAllocationBlock;
     /** Container filename. (UTF-8) */
     const char             *pszFilename;