Changeset 24493 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 9, 2009 11:59:49 AM (15 years ago)

Author:

vboxsync

Message:

API/Machine,Session: add a force mount parameter to MountMedium and the associated other places

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (6 diffs)
• MachineImpl.cpp (modified) (4 diffs)
• SessionImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• include/MachineImpl.h (modified) (3 diffs)
• include/SessionImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2745 +2745 @@
  *
  * @param aMediumAttachment The medium attachment with the new medium state.
+ * @param fForce            Force medium chance, if it is locked or not.
  *
  * @note Locks this object for writing.
  */
-HRESULT Console::doMediumChange(IMediumAttachment *aMediumAttachment)
+HRESULT Console::doMediumChange(IMediumAttachment *aMediumAttachment, bool fForce)
 {
     AutoCaller autoCaller(this);
@@ -2820 +2821 @@
     PVMREQ pReq;
     int vrc = VMR3ReqCall(mpVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)Console::changeDrive, 8,
-                          this, pszDevice, uInstance, uLun, !!fHostDrive, location.raw(), format.raw(), !!fPassthrough);
+                          (PFNRT)Console::changeDrive, 9,
+                          this, pszDevice, uInstance, uLun, !!fHostDrive, location.raw(), format.raw(), !!fPassthrough, fForce);
 
     /* leave the lock before waiting for a result (EMT will call us back!) */
@@ -2873 +2874 @@
  */
 DECLCALLBACK(int) Console::changeDrive(Console *pThis, const char *pszDevice, unsigned uInstance, unsigned uLun,
-                                       bool fHostDrive, const char *pszPath, const char *pszFormat, bool fPassthrough)
+                                       bool fHostDrive, const char *pszPath, const char *pszFormat, bool fPassthrough, bool fForce)
 {
 /// @todo change this to use the same code as in ConsoleImpl2.cpp
-    LogFlowFunc(("pThis=%p pszDevice=%p:{%s} uInstance=%u uLun=%u fHostDrive=%d pszPath=%p:{%s} pszFormat=%p:{%s} fPassthrough=%d\n",
-                 pThis, pszDevice, pszDevice, uInstance, uLun, fHostDrive, pszPath, pszPath, pszFormat, pszFormat, fPassthrough));
+    LogFlowFunc(("pThis=%p pszDevice=%p:{%s} uInstance=%u uLun=%u fHostDrive=%d pszPath=%p:{%s} pszFormat=%p:{%s} fPassthrough=%d fForce=%d\n",
+                 pThis, pszDevice, pszDevice, uInstance, uLun, fHostDrive, pszPath, pszPath, pszFormat, pszFormat, fPassthrough, fForce));
 
     AssertReturn(pThis, VERR_INVALID_PARAMETER);
@@ -2962 +2963 @@
              * Unmount the media.
              */
-            rc = pIMount->pfnUnmount(pIMount, false);
+            rc = pIMount->pfnUnmount(pIMount, fForce);
             if (rc == VERR_PDM_MEDIA_NOT_MOUNTED)
                 rc = VINF_SUCCESS;
@@ -3526 +3527 @@
  * @note Locks this object for writing.
  */
-HRESULT Console::onMediumChange(IMediumAttachment *aMediumAttachment)
+HRESULT Console::onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce)
 {
     LogFlowThisFunc(("\n"));
@@ -3545 +3546 @@
     CheckComRCReturnRC(autoVMCaller.rc());
 
-    rc = doMediumChange(aMediumAttachment);
+    rc = doMediumChange(aMediumAttachment, !!aForce);
 
     /* notify console callbacks on success */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2797 +2797 @@
                                   LONG aControllerPort,
                                   LONG aDevice,
-                                  IN_BSTR aId)
+                                  IN_BSTR aId,
+                                  BOOL aForce)
 {
     int rc = S_OK;
-    LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld\n",
-                     aControllerName, aControllerPort, aDevice));
+    LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld aForce=%d\n",
+                     aControllerName, aControllerPort, aDevice, aForce));
 
     CheckComArgNotNull(aControllerName);
@@ -2897 +2898 @@
 
     alock.unlock();
-    onMediumChange(pAttach);
+    onMediumChange(pAttach, aForce);
 
     return rc;
@@ -9214 +9215 @@
  *  @note Locks this object for reading.
  */
-HRESULT SessionMachine::onMediumChange(IMediumAttachment *aAttachment)
+HRESULT SessionMachine::onMediumChange(IMediumAttachment *aAttachment, BOOL aForce)
 {
     LogFlowThisFunc(("\n"));
@@ -9231 +9232 @@
         return S_OK;
 
-    return directControl->OnMediumChange(aAttachment);
+    return directControl->OnMediumChange(aAttachment, aForce);
 }
 

trunk/src/VBox/Main/SessionImpl.cpp

@@ -558 +558 @@
 }
 
-STDMETHODIMP Session::OnMediumChange(IMediumAttachment *aMediumAttachment)
+STDMETHODIMP Session::OnMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce)
 {
     LogFlowThisFunc(("\n"));
@@ -569 +569 @@
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
 
-    return mConsole->onMediumChange(aMediumAttachment);
+    return mConsole->onMediumChange(aMediumAttachment, aForce);
 }
 

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

@@ -4097 +4097 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="25472915-3da2-42f6-82f2-70a3bc74d73c"
+     uuid="c5669e1a-491a-4367-99c6-28110dd474c6"
      wsmap="managed"
      >
@@ -4884 +4884 @@
           currently mounted medium.</desc>
       </param>
+      <param name="force" type="boolean" dir="in">
+        <desc>Allows to force unmount/mount of a medium which is locked by
+          theDevice slot in the given port to attach the medium to.</desc>
+      </param>
     </method>
 
@@ -12510 +12514 @@
   <interface
      name="IInternalSessionControl" extends="$unknown"
-     uuid="989e2c33-8dfa-437a-9a15-5ad441d50dbf"
+     uuid="f9aac6d0-41b3-46b7-bea4-6370b4036de6"
      internal="yes"
      wsmap="suppress"
@@ -12675 +12679 @@
 
       <param name="mediumAttachment" type="IMediumAttachment" dir="in"/>
+      <param name="force" type="boolean" dir="in"/>
     </method>
 

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

@@ -178 +178 @@
     HRESULT onParallelPortChange (IParallelPort *aParallelPort);
     HRESULT onStorageControllerChange ();
-    HRESULT onMediumChange(IMediumAttachment *aMediumAttachment);
+    HRESULT onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce);
     HRESULT onVRDPServerChange();
     HRESULT onUSBControllerChange();
@@ -441 +441 @@
                                           unsigned uInstance, unsigned uLun,
                                           bool fHostDrive, const char *pszPath,
-                                          const char *pszFormat, bool fPassthrough);
+                                          const char *pszFormat, bool fPassthrough,
+                                          bool fForce);
     const char *controllerTypeToDev(StorageControllerType_T enmCtrlType);
     HRESULT convertBusPortDeviceToLun(StorageBus_T enmBus, LONG port, LONG device, unsigned &uLun);
-    HRESULT doMediumChange(IMediumAttachment *aMediumAttachment);
+    HRESULT doMediumChange(IMediumAttachment *aMediumAttachment, bool fForce);
 
 #ifdef VBOX_DYNAMIC_NET_ATTACH

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

@@ -586 +586 @@
     STDMETHOD(PassthroughDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aPassthrough);
     STDMETHOD(MountMedium)(IN_BSTR aControllerName, LONG aControllerPort,
-                           LONG aDevice, IN_BSTR aId);
+                           LONG aDevice, IN_BSTR aId, BOOL aForce);
     STDMETHOD(GetMedium)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice,
                          IMedium **aMedium);
@@ -701 +701 @@
     virtual HRESULT onUSBControllerChange() { return S_OK; }
     virtual HRESULT onStorageControllerChange() { return S_OK; }
-    virtual HRESULT onMediumChange(IMediumAttachment * /* mediumAttachment */) { return S_OK; }
+    virtual HRESULT onMediumChange(IMediumAttachment * /* mediumAttachment */, BOOL /* force */) { return S_OK; }
     virtual HRESULT onSharedFolderChange() { return S_OK; }
 
@@ -1008 +1008 @@
     HRESULT onNetworkAdapterChange(INetworkAdapter *networkAdapter, BOOL changeAdapter);
     HRESULT onStorageControllerChange();
-    HRESULT onMediumChange(IMediumAttachment *aMediumAttachment);
+    HRESULT onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce);
     HRESULT onSerialPortChange(ISerialPort *serialPort);
     HRESULT onParallelPortChange(IParallelPort *parallelPort);

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

@@ -95 +95 @@
     STDMETHOD(OnParallelPortChange)(IParallelPort *parallelPort);
     STDMETHOD(OnStorageControllerChange)();
-    STDMETHOD(OnMediumChange)(IMediumAttachment *aMediumAttachment);
+    STDMETHOD(OnMediumChange)(IMediumAttachment *aMediumAttachment, BOOL aForce);
     STDMETHOD(OnVRDPServerChange)();
     STDMETHOD(OnUSBControllerChange)();