Changeset 41105 in vbox

Timestamp:

May 1, 2012 6:14:46 PM (13 years ago)

Author:

vboxsync

Message:

use openMedium instead of findMedium

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/VirtualBoxImpl.h (modified) (1 diff)
• Main/src-server/ApplianceImpl.cpp (modified) (1 diff)
• Main/src-server/ApplianceImplExport.cpp (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -226 +226 @@
 /* VBoxManageDisk.cpp */
 HRESULT findMedium(HandlerArg *a, const char *pszFilenameOrUuid,
-                   DeviceType_T enmDevType, bool fSilent,
-                   ComPtr<IMedium> &pMedium);
+                    DeviceType_T enmDevType, bool fSilent,
+                    ComPtr<IMedium> &pMedium);
 HRESULT findOrOpenMedium(HandlerArg *a, const char *pszFilenameOrUuid,
                          DeviceType_T enmDevType, ComPtr<IMedium> &pMedium,

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

@@ -171 +171 @@
 
     if (!fSilent)
+ #if 0 // Substitute call to FindMedium to OpenMedium
         CHECK_ERROR(a->virtualBox, FindMedium(Bstr(pszFilenameOrUuid).raw(),
                                               enmDevType, pMedium.asOutParam()));
+ #endif
+        CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(pszFilenameOrUuid).raw(),
+                                              enmDevType, AccessMode_ReadWrite,
+                                              /* fForceNewUuidOnOpen */ false,
+                                              pMedium.asOutParam()));
     else
+ #if 0 // Substitute call to FindMedium to OpenMedium
         rc = a->virtualBox->FindMedium(Bstr(pszFilenameOrUuid).raw(),
-                                       enmDevType, pMedium.asOutParam());
+                                        enmDevType, pMedium.asOutParam());
+ #endif
+        rc = a->virtualBox->OpenMedium(Bstr(pszFilenameOrUuid).raw(),
+                                            enmDevType, AccessMode_ReadWrite,
+                                            /* fForceNewUuidOnOpen */ false,
+                                            pMedium.asOutParam());
     return rc;
 }
@@ -200 +212 @@
     }
 
+#if 0 // Substitute call to FindMedium to OpenMedium
     rc = a->virtualBox->FindMedium(Bstr(pszFilenameOrUuid).raw(), enmDevType,
                                    pMedium.asOutParam());
+#endif
+
+    rc = a->virtualBox->OpenMedium(Bstr(pszFilenameOrUuid).raw(),
+                                        enmDevType, AccessMode_ReadWrite,
+                                        fForceNewUuidOnOpen,
+                                        pMedium.asOutParam());
     /* If the medium is unknown try to open it. */
     if (!pMedium)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1462 +1462 @@
          */
         Bstr bstrHdaFile(hdaFile);
+#if 0 // Substitute call to FindMedium to OpenMedium
         pVirtualBox->FindMedium(bstrHdaFile.raw(), DeviceType_HardDisk,
+                                 pMedium.asOutParam());
+#endif
+        pVirtualBox->OpenMedium(bstrHdaFile.raw(), DeviceType_HardDisk,
+                                AccessMode_ReadWrite, FALSE /* fForceNewUuid */,
                                 pMedium.asOutParam());
         if (!pMedium)
@@ -1545 +1550 @@
             {
                 /* try to find an existing one */
+#if 0 // Substitute call to FindMedium to OpenMedium
                 rc = pVirtualBox->FindMedium(bstrFdaFile.raw(), DeviceType_Floppy,
                                              pMedium.asOutParam());
+#endif
+                rc = pVirtualBox->OpenMedium(bstrFdaFile.raw(),
+                                            DeviceType_Floppy,
+                                            AccessMode_ReadWrite,
+                                            FALSE /* fForceNewUuid */,
+                                            pMedium.asOutParam());
                 if (FAILED(rc))
                 {
@@ -1626 +1638 @@
             {
                 /* try to find an existing one */
+#if 0 // Substitute call to FindMedium to OpenMedium
                 rc = pVirtualBox->FindMedium(bstrCdromFile.raw(), DeviceType_DVD,
                                              pMedium.asOutParam());
+#endif
+                rc = pVirtualBox->OpenMedium(bstrCdromFile.raw(), DeviceType_DVD, 
+                                             AccessMode_ReadWrite, FALSE /* fForceNewUuid */, 
+                                             pMedium.asOutParam());
                 if (FAILED(rc))
                 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -425 +425 @@
     {
         QString strUuid;
+#if 0 // Substitute call to FindMedium to OpenMedium
         CMedium image = vbox.FindMedium(strSource, KDeviceType_DVD);
+#endif
+
+        CMedium image = vbox.OpenMedium(strSource, KDeviceType_DVD, KAccessMode_ReadWrite, false /* fForceNewUuid */);
         if (image.isNull())
         {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1957 +1957 @@
       <param name="medium" type="IMedium" dir="return">
         <desc>Opened medium object.</desc>
-      </param>
-    </method>
-
-    <method name="findMedium">
-      <desc>
-        Returns a medium of the given type that uses the given fully qualified
-        location or UUID to store medium data.
-
-        The given medium must be known to this VirtualBox installation, i.e.
-        it must be previously created by <link to="#createHardDisk"/> or opened
-        by <link to="#openMedium"/>.
-
-        The search is done by comparing the value of the @a location argument to
-        the <link to="IMedium::location"/> and <link to="IMedium::id" />
-        attributes of each known medium.
-
-        On case sensitive file systems, a case sensitive comparison is performed,
-        otherwise the case of symbols in the file path is ignored.
-
-        <result name="VBOX_E_OBJECT_NOT_FOUND">
-          No medium object matching @a location found.
-        </result>
-      </desc>
-      <param name="location" type="wstring" dir="in">
-        <desc>What to search for. This can either be the UUID or the location string of an open medium.</desc>
-      </param>
-      <param name="type" type="DeviceType" dir="in">
-        <desc>Device type (must be HardDisk, DVD or Floppy)</desc>
-      </param>
-      <param name="medium" type="IMedium" dir="return">
-        <desc>Medium object, if found.</desc>
       </param>
     </method>

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

@@ -145 +145 @@
                           BOOL fForceNewUuid,
                           IMedium **aMedium);
-    STDMETHOD(FindMedium)(IN_BSTR aLocation,
-                          DeviceType_T deviceType,
-                          IMedium **aMedium);
+#if 0 // Remove def of fineMedium
+     STDMETHOD(FindMedium)(IN_BSTR aLocation,
+                           DeviceType_T deviceType,
+                           IMedium **aMedium);
+#endif
 
     STDMETHOD(GetGuestOSType)(IN_BSTR aId, IGuestOSType **aType);

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

@@ -626 +626 @@
      * already */
     /** @todo: Maybe too cost-intensive; try to find a lighter way */
-    while (    RTPathExists(tmpName)
-            || mVirtualBox->FindMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, &harddisk) != VBOX_E_OBJECT_NOT_FOUND
-          )
+
+#if 0 // Substitute call to FindMedium to OpenMedium
+     while (    RTPathExists(tmpName)
+             || mVirtualBox->FindMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, &harddisk) != VBOX_E_OBJECT_NOT_FOUND
+           )
+#endif
+
+     while ( RTPathExists(tmpName)
+             || mVirtualBox->OpenMedium(Bstr(tmpName).raw(),
+                                            DeviceType_HardDisk,
+                                            AccessMode_ReadWrite,
+                                            FALSE /* fForceNewUuid */,
+                                            &harddisk) != VBOX_E_OBJECT_NOT_FOUND
+          )
     {
         RTStrFree(tmpName);

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

@@ -795 +795 @@
 
         Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw()));
+
+#if 0 // Substitute call to FindMedium to OpenMedium
         HRESULT rc = mVirtualBox->FindMedium(bstrSrcFilePath.raw(), DeviceType_HardDisk, pSourceDisk.asOutParam());
+#endif
+        HRESULT rc  = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(),
+                                            DeviceType_HardDisk,
+                                            AccessMode_ReadWrite,
+                                            FALSE /* fForceNewUuid */,
+                                            pSourceDisk.asOutParam());
         if (FAILED(rc)) throw rc;
 

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

@@ -1771 +1771 @@
 }
 
+#if 0 // FindMedium  is redundant
 STDMETHODIMP VirtualBox::FindMedium(IN_BSTR   aLocation,
-                                    DeviceType_T aDeviceType,
-                                    IMedium **aMedium)
-{
-    CheckComArgStrNotEmptyOrNull(aLocation);
-    CheckComArgOutPointerValid(aMedium);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    Guid id(aLocation);
-    Utf8Str strLocation(aLocation);
-
-    HRESULT rc;
-    ComObjPtr<Medium> pMedium;
-
-    switch (aDeviceType)
-    {
-        case DeviceType_HardDisk:
-            if (!id.isEmpty())
-                rc = findHardDiskById(id, true /* setError */, &pMedium);
-            else
-                rc = findHardDiskByLocation(strLocation, true /* setError */, &pMedium);
-        break;
-
-        case DeviceType_Floppy:
-        case DeviceType_DVD:
-            if (!id.isEmpty())
-                rc = findDVDOrFloppyImage(aDeviceType, &id, Utf8Str::Empty, true /* setError */, &pMedium);
-            else
-                rc = findDVDOrFloppyImage(aDeviceType, NULL, strLocation, true /* setError */, &pMedium);
-        break;
-
-        default:
+                                     DeviceType_T aDeviceType,
+                                     IMedium **aMedium)
+{
+     CheckComArgStrNotEmptyOrNull(aLocation);
+     CheckComArgOutPointerValid(aMedium);
+
+     AutoCaller autoCaller(this);
+     if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+     Guid id(aLocation);
+     Utf8Str strLocation(aLocation);
+
+     HRESULT rc;
+     ComObjPtr<Medium> pMedium;
+ 
+     switch (aDeviceType)
+     {
+         case DeviceType_HardDisk:
+             if (!id.isEmpty())
+                 rc = findHardDiskById(id, true /* setError */, &pMedium);
+             else
+                 rc = findHardDiskByLocation(strLocation, true /* setError */, &pMedium);
+         break;
+
+         case DeviceType_Floppy:
+         case DeviceType_DVD:
+             if (!id.isEmpty())
+                 rc = findDVDOrFloppyImage(aDeviceType, &id, Utf8Str::Empty, true /* setError */, &pMedium);
+             else
+                 rc = findDVDOrFloppyImage(aDeviceType, NULL, strLocation, true /* setError */, &pMedium);
+         break;
+
+         default:
             return setError(E_INVALIDARG,
                             tr("Invalid device type %d"), aDeviceType);
-    }
+}
+#endif
 
     /* the below will set *aHardDisk to NULL if hardDisk is null */
-    pMedium.queryInterfaceTo(aMedium);
-
-    return rc;
-}
+//    pMedium.queryInterfaceTo(aMedium);
+
+//    return rc;
+//}
 
 /** @note Locks this object for reading. */