Changeset 77606 in vbox for trunk/src

Timestamp:

Mar 8, 2019 2:55:07 AM (6 years ago)

Author:

vboxsync

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

129234

Message:

Added AllocationBlockSize property to VDI backend, and ability to set properties with VBoxManage --property key=value

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (8 diffs)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Main/src-server/MediumImpl.cpp (modified) (1 diff)
• Storage/VDI.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ +1 @@
+#include <signal.h>
 /* $Id$ */
 /** @file
@@ -50 +51 @@
     MEDIUMCATEGORY_FLOPPY
 } MEDIUMCATEGORY;
-
-
 
 // funcs
@@ -244 +243 @@
     { "--variant",      'm', RTGETOPT_REQ_STRING },
     { "-variant",       'm', RTGETOPT_REQ_STRING },     // deprecated
+    { "--property",     'p', RTGETOPT_REQ_STRING }
 };
 
@@ -253 +253 @@
     const char *diffparent = NULL;
     uint64_t size = 0;
+    typedef struct MEDIUMPROPERTY_LIST {
+        struct MEDIUMPROPERTY_LIST *next;
+        char *key;
+        char *value;
+    } MEDIUMPROPERTY, *PMEDIUMPROPERTY;
+    PMEDIUMPROPERTY pMediumProps = NULL;
     enum {
         CMD_NONE,
@@ -312 +318 @@
                 break;
 
+            case 'p':   // --property
+            {
+                /* allocate property kvp, parse, and append to end of singly linked list */
+# define PROP_MAXLEN 256
+                PMEDIUMPROPERTY pNewProp = (PMEDIUMPROPERTY)RTMemAlloc(sizeof(MEDIUMPROPERTY));
+                if (!pNewProp)
+                    return errorArgument("Can't allocate memory for property '%s'", ValueUnion.psz);
+                int cbKvp = RTStrNLen(ValueUnion.psz, PROP_MAXLEN);
+                char *cp;
+                for (cp = (char *)ValueUnion.psz; *cp != '=' && cp < ValueUnion.psz + cbKvp; cp++)
+                    continue;
+                if (cp < ValueUnion.psz + cbKvp)
+                {
+                    *cp = '\0';
+                    pNewProp->next = NULL;
+                    pNewProp->key = (char *)ValueUnion.psz;
+                    pNewProp->value = cp + 1;
+                }
+                if (pMediumProps) {
+                    PMEDIUMPROPERTY pProp;
+                    for (pProp = pMediumProps; pProp->next; pProp = pProp->next)
+                        continue;
+                    pProp->next = pNewProp;
+                }
+                else
+                    pMediumProps = pNewProp;
+            }
             case 'F':   // --static ("fixed"/"flat")
             {
@@ -441 +474 @@
         rc = E_INVALIDARG; /* cannot happen but make gcc happy */
 
+
     if (SUCCEEDED(rc) && pMedium)
     {
+        if (pMediumProps)
+            for (PMEDIUMPROPERTY pProp = pMediumProps; pProp; pProp = pProp->next)
+                CHECK_ERROR(pMedium, SetProperty(Bstr(pProp->key).raw(), Bstr(pProp->value).raw()));
+        }
+
         ComPtr<IProgress> pProgress;
         com::SafeArray<MediumVariant_T> l_variants(sizeof(MediumVariant_T)*8);
@@ -461 +500 @@
             rc = showProgress(pProgress);
             CHECK_PROGRESS_ERROR(pProgress, ("Failed to create medium"));
-        }
     }
 
@@ -1000 +1038 @@
             else if (cmd == CMD_DVD)
                 rc = createMedium(a, strFormat.c_str(), pszDst, DeviceType_DVD,
-                                  AccessMode_ReadOnly, pDstMedium);
+                                  AccessMode_ReadOnly,  pDstMedium);
             else if (cmd == CMD_FLOPPY)
                 rc = createMedium(a, strFormat.c_str(), pszDst, DeviceType_Floppy,

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -993 +993 @@
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX,\n"
                      "                                       Formatted]\n"
+                     "                            [[--property <name>=<value>] --property <name>=<value]...\n"
                      "\n", SEP);
 

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

@@ -2439 +2439 @@
     switch (m->state)
     {
+        case MediumState_NotCreated:
         case MediumState_Created:
         case MediumState_Inaccessible:

trunk/src/VBox/Storage/VDI.cpp

@@ -39 +39 @@
 #define SET_ENDIAN_U32(conv, u32) (conv == VDIECONV_H2F ? RT_H2LE_U32(u32) : RT_LE2H_U32(u32))
 #define SET_ENDIAN_U64(conv, u64) (conv == VDIECONV_H2F ? RT_H2LE_U64(u64) : RT_LE2H_U64(u64))
+
+static const char *vdiAllocationBlockSize = "1048576";
+
+static const VDCONFIGINFO vdiConfigInfo[] = {
+    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      0 }
+};
 
 
@@ -178 +184 @@
 }
 
+
 /**
  * Internal: Set the appropriate endianess on all the Blocks pointed.
@@ -549 +556 @@
  */
 static int vdiSetupImageState(PVDIIMAGEDESC pImage, unsigned uImageFlags, const char *pszComment,
-                              uint64_t cbSize, uint32_t cbDataAlign, PCVDGEOMETRY pPCHSGeometry,
+                              uint64_t cbSize, uint32_t cbAllocationBlock, uint32_t cbDataAlign, PCVDGEOMETRY pPCHSGeometry,
                               PCVDGEOMETRY pLCHSGeometry)
 {
@@ -555 +562 @@
 
     vdiInitPreHeader(&pImage->PreHeader);
-    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, VDI_IMAGE_DEFAULT_BLOCK_SIZE, 0,
+    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, cbAllocationBlock, 0,
                   cbDataAlign);
     /* Save PCHS geometry. Not much work, and makes the flow of information
@@ -696 +703 @@
     int rc = VINF_SUCCESS;
     uint32_t cbDataAlign = VDI_DATA_ALIGN;
-
+    uint32_t cbAllocationBlock = VDI_IMAGE_DEFAULT_BLOCK_SIZE;
     AssertPtr(pPCHSGeometry);
     AssertPtr(pLCHSGeometry);
@@ -710 +717 @@
                        N_("VDI: comment is too long for '%s'"), pImage->pszFilename);
 
+    PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(pImage->pVDIfsImage);
+    if (pImgCfg) {
+        rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize", &cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
+        if (RT_FAILURE(rc))
+            rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
+                           N_("VDI: Getting AllocationBlockSize for '%s' failed (%Rrc)"), pImage->pszFilename, rc);
+    }
+
     if (pIfCfg)
     {
@@ -720 +735 @@
     if (RT_SUCCESS(rc))
     {
-        rc = vdiSetupImageState(pImage, uImageFlags, pszComment, cbSize, cbDataAlign,
-                                pPCHSGeometry, pLCHSGeometry);
+
+        rc = vdiSetupImageState(pImage, uImageFlags, pszComment, cbSize,
+                cbAllocationBlock, cbDataAlign, pPCHSGeometry, pLCHSGeometry);
         if (RT_SUCCESS(rc))
         {
@@ -1484 +1500 @@
         PVDINTERFACEPROGRESS pIfProgress = VDIfProgressGet(pVDIfsOperation);
         PVDINTERFACECONFIG pIfCfg = VDIfConfigGet(pVDIfsOperation);
-
         pImage->pszFilename = pszFilename;
         pImage->pStorage = NULL;
@@ -3132 +3147 @@
     s_aVdiFileExtensions,
     /* paConfigInfo */
-    NULL,
+    vdiConfigInfo,
     /* pfnProbe */
     vdiProbe,