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

Timestamp:

Mar 29, 2022 3:50:26 PM (3 years ago)

Author:

vboxsync

Message:

Main/Machine+FE/Qt+VBoxManage/showvminfo: Attaching USB devices to a VM
when it isn't running should default to being marked as 'hot-pluggable'.
Further, attempts to remove the 'hot-pluggable' status of a USB device
via either the API or GUI should be impossible. Also update 'VBoxManage
showvminfo' to include the 'hot-pluggable' status of medium attachments
along with a few other IMediumAttachment attributes which were omitted
previously. bugref:8211

File:

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

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

@@ -3544 +3544 @@
         fSilent = true;
 
-    /* Check that the controller can do hotplugging if we detach the device while the VM is running. */
+    /* Check that the controller can do hot-plugging if we attach the device while the VM is running. */
     bool fHotplug = false;
     if (!fSilent && Global::IsOnlineOrTransient(mData->mMachineState))
@@ -3551 +3551 @@
     if (fHotplug && !i_isControllerHotplugCapable(ctrlType))
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Controller '%s' does not support hotplugging"),
+                        tr("Controller '%s' does not support hot-plugging"),
                         aName.c_str());
+
+    /* Attaching a USB device when a VM is powered off should default to being marked as hot-pluggable */
+    if (!fHotplug && !Global::IsOnlineOrTransient(mData->mMachineState) && ctrlType == StorageControllerType_USB)
+        fHotplug = true;
 
     // check that the port and device are not out of range
@@ -4122 +4126 @@
         fSilent = true;
 
-    /* Check that the controller can do hotplugging if we detach the device while the VM is running. */
+    /* Check that the controller can do hot-plugging if we detach the device while the VM is running. */
     bool fHotplug = false;
     if (!fSilent && Global::IsOnlineOrTransient(mData->mMachineState))
@@ -4129 +4133 @@
     if (fHotplug && !i_isControllerHotplugCapable(ctrlType))
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Controller '%s' does not support hotplugging"),
+                        tr("Controller '%s' does not support hot-plugging"),
                         aName.c_str());
 
@@ -4143 +4147 @@
     if (fHotplug && !pAttach->i_getHotPluggable())
         return setError(VBOX_E_NOT_SUPPORTED,
-                        tr("The device slot %d on port %d of controller '%s' does not support hotplugging"),
+                        tr("The device slot %d on port %d of controller '%s' does not support hot-plugging"),
                         aDevice, aControllerPort, aName.c_str());
 
@@ -4208 +4212 @@
         fSilent = true;
 
-    /* Check that the controller can do hotplugging if we detach the device while the VM is running. */
+    /* Check that the controller can do hot-plugging if we detach the device while the VM is running. */
     bool fHotplug = false;
     if (!fSilent && Global::IsOnlineOrTransient(mData->mMachineState))
@@ -4215 +4219 @@
     if (fHotplug && !i_isControllerHotplugCapable(ctrlType))
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Controller '%s' does not support hotplugging which is required to change the passthrough setting while the VM is running"),
+                        tr("Controller '%s' does not support hot-plugging which is required to change the passthrough setting while the VM is running"),
                         aName.c_str());
 
@@ -4413 +4417 @@
 
     if (!i_isControllerHotplugCapable(ctrlType))
-    return setError(VBOX_E_NOT_SUPPORTED,
-                    tr("Controller '%s' does not support changing the hot-pluggable device flag"),
-                    aName.c_str());
+        return setError(VBOX_E_NOT_SUPPORTED,
+                        tr("Controller '%s' does not support changing the hot-pluggable device flag"),
+                        aName.c_str());
+
+    /* silently ignore attempts to modify the hot-plug status of USB devices */
+    if (ctrlType == StorageControllerType_USB)
+        return S_OK;
 
     i_setModified(IsModified_Storage);