Changeset 89921 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jun 25, 2021 6:47:30 PM (4 years ago)

Author:

vboxsync

Message:

Main/Console: Correctly handle mouse and keyboard type of None, which in principle was always allowed but still added the hardware.

Frontends/VBoxManage: For modifyvm, allow configuring a VM to have no mouse and/or keyboard.
So far undocumented because it needs more testing, but should be safe.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1691 +1691 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
 
-        InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-        InsertConfigString(pLunL0, "Driver",               "KeyboardQueue");
-        InsertConfigNode(pLunL0,   "Config", &pCfg);
-        InsertConfigInteger(pCfg,  "QueueSize",            64);
-
-        InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
-        InsertConfigString(pLunL1, "Driver",               "MainKeyboard");
-        InsertConfigNode(pLunL1,   "Config", &pCfg);
-        Keyboard *pKeyboard = mKeyboard;
-        InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pKeyboard);
-
-        Mouse *pMouse = mMouse;
+        KeyboardHIDType_T aKbdHID;
+        hrc = pMachine->COMGETTER(KeyboardHIDType)(&aKbdHID);                               H();
+        if (aKbdHID != KeyboardHIDType_None)
+        {
+            InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+            InsertConfigString(pLunL0, "Driver",               "KeyboardQueue");
+            InsertConfigNode(pLunL0,   "Config", &pCfg);
+            InsertConfigInteger(pCfg,  "QueueSize",            64);
+
+            InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
+            InsertConfigString(pLunL1, "Driver",               "MainKeyboard");
+            InsertConfigNode(pLunL1,   "Config", &pCfg);
+            Keyboard *pKeyboard = mKeyboard;
+            InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pKeyboard);
+        }
+
         PointingHIDType_T aPointingHID;
         hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);                          H();
-        InsertConfigNode(pInst,    "LUN#1", &pLunL0);
-        InsertConfigString(pLunL0, "Driver",               "MouseQueue");
-        InsertConfigNode(pLunL0,   "Config", &pCfg);
-        InsertConfigInteger(pCfg, "QueueSize",            128);
-
-        InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
-        InsertConfigString(pLunL1, "Driver",               "MainMouse");
-        InsertConfigNode(pLunL1,   "Config", &pCfg);
-        InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
+        if (aPointingHID != PointingHIDType_None)
+        {
+            InsertConfigNode(pInst,    "LUN#1", &pLunL0);
+            InsertConfigString(pLunL0, "Driver",               "MouseQueue");
+            InsertConfigNode(pLunL0,   "Config", &pCfg);
+            InsertConfigInteger(pCfg, "QueueSize",            128);
+
+            InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
+            InsertConfigString(pLunL1, "Driver",               "MainMouse");
+            InsertConfigNode(pLunL1,   "Config", &pCfg);
+            Mouse *pMouse = mMouse;
+            InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
+        }
 
         /*
@@ -2228 +2236 @@
                 InsertConfigString(pLunL1, "Driver",        "MainMouse");
                 InsertConfigNode(pLunL1,   "Config", &pCfg);
+                Mouse *pMouse = mMouse;
                 InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
             }
@@ -2244 +2253 @@
                 InsertConfigString(pLunL1, "Driver",        "MainMouse");
                 InsertConfigNode(pLunL1,   "Config", &pCfg);
+                Mouse *pMouse = mMouse;
                 InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
             }
 
             /* Virtual USB Keyboard */
-            KeyboardHIDType_T aKbdHID;
-            hrc = pMachine->COMGETTER(KeyboardHIDType)(&aKbdHID);                       H();
             if (aKbdHID == KeyboardHIDType_USBKeyboard)
             {
@@ -2264 +2272 @@
                 InsertConfigString(pLunL1, "Driver",               "MainKeyboard");
                 InsertConfigNode(pLunL1,   "Config", &pCfg);
-                pKeyboard = mKeyboard;
+                Keyboard *pKeyboard = mKeyboard;
                 InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pKeyboard);
             }