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

Timestamp:

Nov 9, 2018 10:25:30 PM (6 years ago)

Author:

vboxsync

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

126515

Message:

Main,VBoxManage,FE/Qt: Extended the createSharedFolder and ISharedFolder methods with a mount poit parameter/attribute for use when auto-mounting. This is especially useful for Windows and OS/2 guests which operates with drive letters. The change has not yet trickled down to the guest interface and VBoxService.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageInfo.cpp (modified) (6 diffs)
• VBoxManageMisc.cpp (modified) (4 diffs)

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

@@ -49 +49 @@
 // funcs
 ///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Helper for formatting an indexed name or some such thing.
+ */
+static const char *FmtNm(char psz[80], const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    RTStrPrintfV(psz, 80, pszFormat, va);
+    va_end(va);
+    return psz;
+}
 
 HRESULT showSnapshots(ComPtr<ISnapshot> &rootSnapshot,
@@ -368 +380 @@
 }
 
+/** Shows a shared folder.   */
+static HRESULT showSharedFolder(ComPtr<ISharedFolder> &sf, VMINFO_DETAILS details, const char *pszDesc,
+                                const char *pszMrInfix, size_t idxMr, bool fFirst)
+{
+    Bstr name, hostPath, bstrAutoMountPoint;
+    BOOL writable = FALSE, fAutoMount = FALSE;
+    CHECK_ERROR2I_RET(sf, COMGETTER(Name)(name.asOutParam()), hrcCheck);
+    CHECK_ERROR2I_RET(sf, COMGETTER(HostPath)(hostPath.asOutParam()), hrcCheck);
+    CHECK_ERROR2I_RET(sf, COMGETTER(Writable)(&writable), hrcCheck);
+    CHECK_ERROR2I_RET(sf, COMGETTER(AutoMount)(&fAutoMount), hrcCheck);
+    CHECK_ERROR2I_RET(sf, COMGETTER(AutoMountPoint)(bstrAutoMountPoint.asOutParam()), hrcCheck);
+
+    if (fFirst && details != VMINFO_MACHINEREADABLE)
+        RTPrintf("\n\n");
+    if (details == VMINFO_MACHINEREADABLE)
+    {
+        char szNm[80];
+        outputMachineReadableString(FmtNm(szNm, "SharedFolderName%s%zu", pszMrInfix, idxMr), &name);
+        outputMachineReadableString(FmtNm(szNm, "SharedFolderPath%s%zu", pszMrInfix, idxMr), &hostPath);
+    }
+    else
+    {
+        RTPrintf("Name: '%ls', Host path: '%ls' (%s), %s%s%",
+                 name.raw(), hostPath.raw(), pszDesc, writable ? "writable" : "readonly", fAutoMount ? ", auto-mount" : "");
+        if (bstrAutoMountPoint.isNotEmpty())
+            RTPrintf(", mount-point: '%ls'\n", bstrAutoMountPoint.raw());
+        else
+            RTPrintf("\n");
+    }
+    return S_OK;
+}
+
+
 static const char *paravirtProviderToString(ParavirtProvider_T provider, VMINFO_DETAILS details)
 {
@@ -407 +452 @@
             return "Unknown";
     }
-}
-
-/**
- * Helper for formatting an indexed name or some such thing.
- */
-static const char *FmtNm(char psz[80], const char *pszFormat, ...)
-{
-    va_list va;
-    va_start(va, pszFormat);
-    RTStrPrintfV(psz, 80, pszFormat, va);
-    va_end(va);
-    return psz;
 }
 
@@ -2218 +2251 @@
         {
             ComPtr<ISharedFolder> sf = sfColl[i];
-            Bstr name, hostPath;
-            sf->COMGETTER(Name)(name.asOutParam());
-            sf->COMGETTER(HostPath)(hostPath.asOutParam());
-            RTPrintf("Name: '%ls', Host path: '%ls' (global mapping)\n", name.raw(), hostPath.raw());
+            showSharedFolder(sf, details, "global mapping", "GlobalMapping", i + 1, numSharedFolders == 0);
             ++numSharedFolders;
         }
@@ -2229 +2259 @@
     {
         com::SafeIfaceArray <ISharedFolder> folders;
-
         CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
-
         for (size_t i = 0; i < folders.size(); ++i)
         {
             ComPtr<ISharedFolder> sf = folders[i];
-
-            Bstr name, hostPath;
-            BOOL writable;
-            sf->COMGETTER(Name)(name.asOutParam());
-            sf->COMGETTER(HostPath)(hostPath.asOutParam());
-            sf->COMGETTER(Writable)(&writable);
-            if (!numSharedFolders && details != VMINFO_MACHINEREADABLE)
-                RTPrintf("\n\n");
-            if (details == VMINFO_MACHINEREADABLE)
-            {
-                outputMachineReadableString(FmtNm(szNm, "SharedFolderNameMachineMapping%zu", i + 1), &name);
-                outputMachineReadableString(FmtNm(szNm, "SharedFolderPathMachineMapping%zu", i + 1), &hostPath);
-            }
-            else
-                RTPrintf("Name: '%ls', Host path: '%ls' (machine mapping), %s\n",
-                         name.raw(), hostPath.raw(), writable ? "writable" : "readonly");
+            showSharedFolder(sf, details, "machine mapping", "MachineMapping", i + 1, numSharedFolders == 0);
             ++numSharedFolders;
         }
@@ -2258 +2271 @@
     {
         com::SafeIfaceArray <ISharedFolder> folders;
-
         CHECK_ERROR_RET(pConsole, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
-
         for (size_t i = 0; i < folders.size(); ++i)
         {
             ComPtr<ISharedFolder> sf = folders[i];
-
-            Bstr name, hostPath;
-            sf->COMGETTER(Name)(name.asOutParam());
-            sf->COMGETTER(HostPath)(hostPath.asOutParam());
-            if (!numSharedFolders && details != VMINFO_MACHINEREADABLE)
-                RTPrintf("\n\n");
-            if (details == VMINFO_MACHINEREADABLE)
-            {
-                outputMachineReadableString(FmtNm(szNm, "SharedFolderNameTransientMapping%zu", i + 1), &name);
-                outputMachineReadableString(FmtNm(szNm, "SharedFolderPathTransientMapping%zu", i + 1), &hostPath);
-            }
-            else
-                RTPrintf("Name: '%ls', Host path: '%ls' (transient mapping)\n", name.raw(), hostPath.raw());
+            showSharedFolder(sf, details, "transient mapping", "TransientMapping", i + 1, numSharedFolders == 0);
             ++numSharedFolders;
         }

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

@@ -1096 +1096 @@
         bool fWritable = true;
         bool fAutoMount = false;
+        char *pszAutoMountPoint = "";
 
         for (int i = 2; i < a->argc; i++)
@@ -1130 +1131 @@
                 fAutoMount = true;
             }
+            else if (!strcmp(a->argv[i], "--auto-mount-point"))
+            {
+                if (a->argc <= i + 1 || !*a->argv[i+1])
+                    return errorArgument("Missing argument to '%s'", a->argv[i]);
+                i++;
+                pszAutoMountPoint = a->argv[i];
+            }
             else
                 return errorSyntax(USAGE_SHAREDFOLDER_ADD, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
@@ -1160 +1168 @@
                                       "Machine '%s' is not currently running.\n", pszMachineName);
 
-            CHECK_ERROR(console, CreateSharedFolder(Bstr(name).raw(),
-                                                    Bstr(hostpath).raw(),
-                                                    fWritable, fAutoMount));
+            CHECK_ERROR(console, CreateSharedFolder(Bstr(name).raw(), Bstr(hostpath).raw(),
+                                                    fWritable, fAutoMount, Bstr(pszAutoMountPoint).raw()));
             a->session->UnlockMachine();
         }
@@ -1174 +1181 @@
             a->session->COMGETTER(Machine)(sessionMachine.asOutParam());
 
-            CHECK_ERROR(sessionMachine, CreateSharedFolder(Bstr(name).raw(),
-                                                           Bstr(hostpath).raw(),
-                                                           fWritable, fAutoMount));
+            CHECK_ERROR(sessionMachine, CreateSharedFolder(Bstr(name).raw(), Bstr(hostpath).raw(),
+                                                           fWritable, fAutoMount, Bstr(pszAutoMountPoint).raw()));
             if (SUCCEEDED(rc))
                 CHECK_ERROR(sessionMachine, SaveSettings());