Changeset 41347 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 17, 2012 10:40:43 PM (13 years ago)

Author:

vboxsync

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

78026

Message:

FE/VBoxManage: Don't open the medium with read/write access if it is not required (showhdinfo and the source disk when cloning)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (1 diff)
• VBoxManageDisk.cpp (modified) (9 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)
• VBoxManageStorageController.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -229 +229 @@
                    ComPtr<IMedium> &pMedium);
 HRESULT findOrOpenMedium(HandlerArg *a, const char *pszFilenameOrUuid,
-                         DeviceType_T enmDevType, ComPtr<IMedium> &pMedium,
-                         bool fForceNewUuidOnOpen, bool *pfWasUnknown);
+                         DeviceType_T enmDevType, AccessMode_T enmAccessMode,
+                         ComPtr<IMedium> &pMedium, bool fForceNewUuidOnOpen,
+                         bool *pfWasUnknown);
 int handleCreateHardDisk(HandlerArg *a);
 int handleModifyHardDisk(HandlerArg *a);

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

@@ -186 +186 @@
 
 HRESULT findOrOpenMedium(HandlerArg *a, const char *pszFilenameOrUuid,
-                         DeviceType_T enmDevType, ComPtr<IMedium> &pMedium,
-                         bool fForceNewUuidOnOpen, bool *pfWasUnknown)
+                         DeviceType_T enmDevType, AccessMode_T enmAccessMode,
+                         ComPtr<IMedium> &pMedium, bool fForceNewUuidOnOpen,
+                         bool *pfWasUnknown)
 {
     HRESULT rc;
@@ -208 +209 @@
     rc = a->virtualBox->OpenMedium(Bstr(pszFilenameOrUuid).raw(), 
                                    enmDevType,
-                                   AccessMode_ReadWrite,
+                                   enmAccessMode,
                                    /*fForceNewUidOnOpen */ false,
                                    pMedium.asOutParam());
@@ -215 +216 @@
     {
         CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(pszFilenameOrUuid).raw(),
-                                              enmDevType, AccessMode_ReadWrite,
+                                              enmDevType, enmAccessMode,
                                               fForceNewUuidOnOpen,
                                               pMedium.asOutParam()));
@@ -372 +373 @@
                 format = pszExt;
         }
-        rc = findOrOpenMedium(a, diffparent, DeviceType_HardDisk,
+        rc = findOrOpenMedium(a, diffparent, DeviceType_HardDisk, AccessMode_ReadWrite,
                               parentHardDisk, false /* fForceNewUuidOnOpen */,
                               &fUnknownParent);
@@ -537 +538 @@
         rc = findMedium(a, FilenameOrUuid, DeviceType_HardDisk, false /* fSilent */, hardDisk);
     else
-        rc = findOrOpenMedium(a, FilenameOrUuid, DeviceType_HardDisk,
+        rc = findOrOpenMedium(a, FilenameOrUuid, DeviceType_HardDisk, AccessMode_ReadWrite,
                               hardDisk, false /* fForceNewUuidOnOpen */, &unknown);
     if (FAILED(rc))
@@ -564 +565 @@
     {
         ComPtr<IProgress> progress;
-        CHECK_ERROR(hardDisk, Compact(progress.asOutParam()));
+        CHECK_ERROR(hardDisk, Compact(FALSE, progress.asOutParam()));
         if (SUCCEEDED(rc))
             rc = showProgress(progress);
@@ -694 +695 @@
     bool fDstUnknown = false;
 
-    rc = findOrOpenMedium(a, pszSrc, DeviceType_HardDisk, srcDisk,
-                          false /* fForceNewUuidOnOpen */, &fSrcUnknown);
+    rc = findOrOpenMedium(a, pszSrc, DeviceType_HardDisk, AccessMode_ReadOnly,
+                          srcDisk, false /* fForceNewUuidOnOpen */, &fSrcUnknown);
     if (FAILED(rc))
         return 1;
@@ -704 +705 @@
         if (fExisting)
         {
-            rc = findOrOpenMedium(a, pszDst, DeviceType_HardDisk, dstDisk,
-                                  false /* fForceNewUuidOnOpen */, &fDstUnknown);
+            rc = findOrOpenMedium(a, pszDst, DeviceType_HardDisk, AccessMode_ReadWrite,
+                                  dstDisk, false /* fForceNewUuidOnOpen */, &fDstUnknown);
             if (FAILED(rc))
                 break;
@@ -986 +987 @@
     bool unknown = false;
 
-    rc = findOrOpenMedium(a, FilenameOrUuid, DeviceType_HardDisk, hardDisk,
-                          false /* fForceNewUuidOnOpen */, &unknown);
+    rc = findOrOpenMedium(a, FilenameOrUuid, DeviceType_HardDisk, AccessMode_ReadOnly,
+                          hardDisk, false /* fForceNewUuidOnOpen */, &unknown);
     if (FAILED(rc))
         return 1;

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

@@ -723 +723 @@
                     ComPtr<IMedium> hardDisk;
                     rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_HardDisk,
-                                          hardDisk, false /* fForceNewUuidOnOpen */,
-                                          NULL);
+                                          AccessMode_ReadWrite, hardDisk,
+                                          false /* fForceNewUuidOnOpen */, NULL);
                     if (FAILED(rc))
                         break;
@@ -819 +819 @@
                     ComPtr<IMedium> hardDisk;
                     rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_HardDisk,
-                                          hardDisk, false /* fForceNewUuidOnOpen */,
-                                          NULL);
+                                          AccessMode_ReadWrite, hardDisk,
+                                          false /* fForceNewUuidOnOpen */, NULL);
                     if (FAILED(rc))
                         break;
@@ -947 +947 @@
                 {
                     rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_DVD,
-                                          dvdMedium, false /* fForceNewUuidOnOpen */,
-                                          NULL);
+                                          AccessMode_ReadOnly, dvdMedium,
+                                          false /* fForceNewUuidOnOpen */, NULL);
                     if (FAILED(rc))
                         break;
@@ -1011 +1011 @@
                     {
                         rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_Floppy,
-                                              floppyMedium, false /* fForceNewUuidOnOpen */,
-                                              NULL);
+                                              AccessMode_ReadWrite, floppyMedium,
+                                              false /* fForceNewUuidOnOpen */, NULL);
                         if (FAILED(rc))
                             break;

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

@@ -636 +636 @@
                     Bstr bstrMedium(pszMedium);
                     rc = findOrOpenMedium(a, pszMedium, devTypeRequested,
-                                          pMedium2Mount, fSetNewUuid, NULL);
+                                          AccessMode_ReadWrite, pMedium2Mount,
+                                          fSetNewUuid, NULL);
                     if (FAILED(rc) || !pMedium2Mount)
                         throw Utf8StrFmt("Invalid UUID or filename \"%s\"", pszMedium);