Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 45283) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 45284) @@ -1339,5 +1339,5 @@ - This attribute is read-only. It's recalculated on changing + This attribute is read-only. It's recalculated on changing network attribute (low address of network + 1). @@ -1357,11 +1357,11 @@ - Array of NAT port-forwarding rules in string representation, - in the following format: + Array of NAT port-forwarding rules in string representation, + in the following format: "name:protocolid:[host ip]:host port:[guest ip]:guest port". - Array of NAT port-forwarding rules in string representation, in the + Array of NAT port-forwarding rules in string representation, in the following format: "name:protocolid:[host ip]:host port:[guest ip]:guest port". @@ -1374,6 +1374,6 @@ - IP of the host interface to which the rule should apply. - An empty ip address is acceptable, in which case the NAT engine + IP of the host interface to which the rule should apply. + An empty ip address is acceptable, in which case the NAT engine binds the handling socket to any interface. @@ -1383,5 +1383,5 @@ - The IP address of the guest which the NAT engine will forward + The IP address of the guest which the NAT engine will forward matching packets to. An empty IP address is not acceptable. @@ -2366,13 +2366,13 @@ - - + @@ -20343,17 +20352,17 @@ - + - + @@ -20364,5 +20373,5 @@ @@ -20375,5 +20384,5 @@ - + &aDevice, ULONG *aMaskedIfs); Index: /trunk/src/VBox/Main/include/SessionImpl.h =================================================================== --- /trunk/src/VBox/Main/include/SessionImpl.h (revision 45283) +++ /trunk/src/VBox/Main/include/SessionImpl.h (revision 45284) @@ -101,5 +101,5 @@ STDMETHOD(OnShowWindow)(BOOL aCheck, BOOL *aCanShow, LONG64 *aWinId); STDMETHOD(OnBandwidthGroupChange)(IBandwidthGroup *aBandwidthGroup); - STDMETHOD(OnStorageDeviceChange)(IMediumAttachment *aMediumAttachment, BOOL aRemove); + STDMETHOD(OnStorageDeviceChange)(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent); STDMETHOD(AccessGuestProperty)(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags, BOOL aIsSetter, BSTR *aRetValue, LONG64 *aRetTimestamp, BSTR *aRetFlags); Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 45283) +++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 45284) @@ -3915,8 +3915,9 @@ * @param aMediumAttachment The medium attachment which is added. * @param pUVM Safe VM handle. + * @param fSilent Flag whether to notify the guest about the attached device. * * @note Locks this object for writing. */ -HRESULT Console::doStorageDeviceAttach(IMediumAttachment *aMediumAttachment, PUVM pUVM) +HRESULT Console::doStorageDeviceAttach(IMediumAttachment *aMediumAttachment, PUVM pUVM, bool fSilent) { AutoCaller autoCaller(this); @@ -3988,5 +3989,5 @@ VMREQFLAGS_VBOX_STATUS, (PFNRT)Console::attachStorageDevice, - 7, + 8, this, pUVM, @@ -3995,5 +3996,6 @@ enmBus, fUseHostIOCache, - aMediumAttachment); + aMediumAttachment, + fSilent); /* release the lock before waiting for a result (EMT will call us back!) */ @@ -4035,4 +4037,5 @@ * @param pcszDevice The PDM device name. * @param uInstance The PDM device instance. + * @param fSilent Flag whether to inform the guest about the attached device. * * @thread EMT @@ -4044,5 +4047,6 @@ StorageBus_T enmBus, bool fUseHostIOCache, - IMediumAttachment *aMediumAtt) + IMediumAttachment *aMediumAtt, + bool fSilent) { LogFlowFunc(("pConsole=%p uInstance=%u pszDevice=%p:{%s} enmBus=%u, aMediumAtt=%p\n", @@ -4118,5 +4122,5 @@ true /* fAttachDetach */, false /* fForceUnmount */, - true /* fHotplug */, + !fSilent /* fHotplug */, pUVM, NULL /* paLedDevType */); @@ -4160,8 +4164,9 @@ * @param aMediumAttachment The medium attachment which is added. * @param pUVM Safe VM handle. + * @param fSilent Flag whether to notify the guest about the detached device. * * @note Locks this object for writing. */ -HRESULT Console::doStorageDeviceDetach(IMediumAttachment *aMediumAttachment, PUVM pUVM) +HRESULT Console::doStorageDeviceDetach(IMediumAttachment *aMediumAttachment, PUVM pUVM, bool fSilent) { AutoCaller autoCaller(this); @@ -4230,5 +4235,5 @@ VMREQFLAGS_VBOX_STATUS, (PFNRT)Console::detachStorageDevice, - 6, + 7, this, pUVM, @@ -4236,5 +4241,6 @@ uInstance, enmBus, - aMediumAttachment); + aMediumAttachment, + fSilent); /* release the lock before waiting for a result (EMT will call us back!) */ @@ -4275,4 +4281,5 @@ * @param pcszDevice The PDM device name. * @param uInstance The PDM device instance. + * @param fSilent Flag whether to notify the guest about the detached device. * * @thread EMT @@ -4283,5 +4290,6 @@ unsigned uInstance, StorageBus_T enmBus, - IMediumAttachment *pMediumAtt) + IMediumAttachment *pMediumAtt, + bool fSilent) { LogFlowFunc(("pConsole=%p uInstance=%u pszDevice=%p:{%s} enmBus=%u, pMediumAtt=%p\n", @@ -4363,5 +4371,10 @@ if (pLunL0) { - rc = PDMR3DeviceDetach(pUVM, pcszDevice, uInstance, uLUN, 0); + uint32_t fFlags = 0; + + if (fSilent) + fFlags |= PDM_TACH_FLAGS_NOT_HOT_PLUG; + + rc = PDMR3DeviceDetach(pUVM, pcszDevice, uInstance, uLUN, fFlags); if (rc == VERR_PDM_NO_DRIVER_ATTACHED_TO_LUN) rc = VINF_SUCCESS; @@ -5368,5 +5381,5 @@ * @note Locks this object for writing. */ -HRESULT Console::onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove) +HRESULT Console::onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent) { LogFlowThisFunc(("\n")); @@ -5382,7 +5395,7 @@ { if (aRemove) - rc = doStorageDeviceDetach(aMediumAttachment, ptrVM.rawUVM()); + rc = doStorageDeviceDetach(aMediumAttachment, ptrVM.rawUVM(), aSilent); else - rc = doStorageDeviceAttach(aMediumAttachment, ptrVM.rawUVM()); + rc = doStorageDeviceAttach(aMediumAttachment, ptrVM.rawUVM(), aSilent); ptrVM.release(); } @@ -5390,5 +5403,5 @@ /* notify console callbacks on success */ if (SUCCEEDED(rc)) - fireStorageDeviceChangedEvent(mEventSource, aMediumAttachment, aRemove); + fireStorageDeviceChangedEvent(mEventSource, aMediumAttachment, aRemove, aSilent); LogFlowThisFunc(("Leaving rc=%#x\n", rc)); Index: /trunk/src/VBox/Main/src-client/SessionImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/SessionImpl.cpp (revision 45283) +++ /trunk/src/VBox/Main/src-client/SessionImpl.cpp (revision 45284) @@ -775,17 +775,17 @@ } -STDMETHODIMP Session::OnStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove) -{ - LogFlowThisFunc(("\n")); - - AutoCaller autoCaller(this); - AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); - - AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE); - AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE); - AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE); - - return mConsole->onStorageDeviceChange(aMediumAttachment, aRemove); +STDMETHODIMP Session::OnStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent) +{ + LogFlowThisFunc(("\n")); + + AutoCaller autoCaller(this); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); + + AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); + AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE); + AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE); + AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE); + + return mConsole->onStorageDeviceChange(aMediumAttachment, aRemove, aSilent); } Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 45283) +++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 45284) @@ -3775,7 +3775,18 @@ aControllerName); + bool fSilent = false; + Bstr strReconfig; + + /* Check whether the flag to allow silent storage attachment reconfiguration is set. */ + rc = mParent->GetExtraData(Bstr("StorageMgmt/SilentReconfigureWhilePaused").raw(), strReconfig.asOutParam()); + if (FAILED(rc)) + return rc; + if ( mData->mMachineState == MachineState_Paused + && strReconfig == "1") + fSilent = true; + /* Check that the controller can do hotplugging if we detach the device while the VM is running. */ bool fHotplug = false; - if (Global::IsOnlineOrTransient(mData->mMachineState)) + if (!fSilent && Global::IsOnlineOrTransient(mData->mMachineState)) fHotplug = true; @@ -4176,6 +4187,6 @@ alock.release(); - if (fHotplug) - rc = onStorageDeviceChange(attachment, FALSE /* aRemove */); + if (fHotplug || fSilent) + rc = onStorageDeviceChange(attachment, FALSE /* aRemove */, fSilent); mParent->saveModifiedRegistries(); @@ -4214,7 +4225,18 @@ aControllerName); + bool fSilent = false; + Bstr strReconfig; + + /* Check whether the flag to allow silent storage attachment reconfiguration is set. */ + rc = mParent->GetExtraData(Bstr("StorageMgmt/SilentReconfigureWhilePaused").raw(), strReconfig.asOutParam()); + if (FAILED(rc)) + return rc; + if ( mData->mMachineState == MachineState_Paused + && strReconfig == "1") + fSilent = true; + /* Check that the controller can do hotplugging if we detach the device while the VM is running. */ bool fHotplug = false; - if (Global::IsOnlineOrTransient(mData->mMachineState)) + if (!fSilent && Global::IsOnlineOrTransient(mData->mMachineState)) fHotplug = true; @@ -4237,8 +4259,8 @@ * If this fails we can roll back without loosing data. */ - if (fHotplug) + if (fHotplug || fSilent) { alock.release(); - rc = onStorageDeviceChange(pAttach, TRUE /* aRemove */); + rc = onStorageDeviceChange(pAttach, TRUE /* aRemove */, fSilent); alock.acquire(); } @@ -13506,5 +13528,5 @@ * @note Locks this object for reading. */ -HRESULT SessionMachine::onStorageDeviceChange(IMediumAttachment *aAttachment, BOOL aRemove) +HRESULT SessionMachine::onStorageDeviceChange(IMediumAttachment *aAttachment, BOOL aRemove, BOOL aSilent) { LogFlowThisFunc(("\n")); @@ -13523,5 +13545,5 @@ return S_OK; - return directControl->OnStorageDeviceChange(aAttachment, aRemove); + return directControl->OnStorageDeviceChange(aAttachment, aRemove, aSilent); }