Changeset 37656 in vbox for trunk

Timestamp:

Jun 28, 2011 10:38:39 AM (13 years ago)

Author:

vboxsync

Message:

Main: Clarify the error message if the controller doesn't support hotplugging. Reject hotplugging DVD drives for now (needs further testing)

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

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

@@ -3425 +3425 @@
     if (fHotplug && !isControllerHotplugCapable(ctrlType))
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Invalid machine state: %s"),
-                        Global::stringifyMachineState(mData->mMachineState));
+                        tr("Controller '%ls' does not support hotplugging"),
+                        aControllerName);
+
+    if (fHotplug && aType == DeviceType_DVD)
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("Attaching a DVD drive while the VM is running is not supported"));
 
     // check that the port and device are not out of range
@@ -3845 +3849 @@
     if (fHotplug && !isControllerHotplugCapable(ctrlType))
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Invalid machine state: %s"),
-                        Global::stringifyMachineState(mData->mMachineState));
+                        tr("Controller '%ls' does not support hotplugging"),
+                        aControllerName);
+
+    if (fHotplug && aType == DeviceType_DVD)
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("Detaching a DVD drive while the VM is running is not supported"));
 
     MediumAttachment *pAttach = findAttachment(mMediaData->mAttachments,