Changeset 26971 in vbox

Timestamp:

Mar 2, 2010 8:45:15 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: enable USB support if USB keyboard/mouse is added to a VM

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (6 diffs)

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

@@ -1220 +1220 @@
             case MODIFYVM_HIDPTR:
             {
+                bool fEnableUsb = false;
                 if (!strcmp(ValueUnion.psz, "ps2"))
                 {
@@ -1227 +1228 @@
                 {
                     CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBMouse));
+                    if (SUCCEEDED(rc))
+                        fEnableUsb = true;
                 }
                 else if (!strcmp(ValueUnion.psz, "usbtablet"))
                 {
                     CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBTablet));
+                    if (SUCCEEDED(rc))
+                        fEnableUsb = true;
                 }
                 else
@@ -1237 +1242 @@
                     rc = E_FAIL;
                 }
+                if (fEnableUsb)
+                {
+                    /* Make sure the OHCI controller is enabled. */
+                    ComPtr<IUSBController> UsbCtl;
+                    rc = machine->COMGETTER(USBController)(UsbCtl.asOutParam());
+                    if (SUCCEEDED(rc))
+                    {
+                        BOOL fEnabled;
+                        rc = UsbCtl->COMGETTER(Enabled)(&fEnabled);
+                        if (FAILED(rc))
+                            fEnabled = false;
+                        if (!fEnabled)
+                            CHECK_ERROR(UsbCtl, COMSETTER(Enabled)(true));
+                    }
+                }
                 break;
             }
@@ -1242 +1262 @@
             case MODIFYVM_HIDKBD:
             {
+                bool fEnableUsb = false;
                 if (!strcmp(ValueUnion.psz, "ps2"))
                 {
@@ -1249 +1270 @@
                 {
                     CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_USBKeyboard));
+                    if (SUCCEEDED(rc))
+                        fEnableUsb = true;
                 }
                 else
@@ -1254 +1277 @@
                     errorArgument("Invalid type '%s' specfied for keyboard", ValueUnion.psz);
                     rc = E_FAIL;
+                }
+                if (fEnableUsb)
+                {
+                    /* Make sure the OHCI controller is enabled. */
+                    ComPtr<IUSBController> UsbCtl;
+                    rc = machine->COMGETTER(USBController)(UsbCtl.asOutParam());
+                    if (SUCCEEDED(rc))
+                    {
+                        BOOL fEnabled;
+                        rc = UsbCtl->COMGETTER(Enabled)(&fEnabled);
+                        if (FAILED(rc))
+                            fEnabled = false;
+                        if (!fEnabled)
+                            CHECK_ERROR(UsbCtl, COMSETTER(Enabled)(true));
+                    }
                 }
                 break;