Changeset 77606 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageDisk.cpp (modified) (8 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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