vbox的更動 54060 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

時間撮記:

2015-2-2 下午09:17:31 (10 年 以前)

作者:

vboxsync

訊息:

Main: Fix i_configMediumAttachment inconsistency for USB storage devices

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (修改) (5 筆差異)

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

@@ -2222 +2222 @@
             {
                 IMediumAttachment *pMediumAtt = atts[j];
-                rc = i_configMediumAttachment(pCtlInst,
-                                              pszCtrlDev,
+                rc = i_configMediumAttachment(pszCtrlDev,
                                               ulInstance,
                                               enmBus,
@@ -3546 +3545 @@
 }
 
-int Console::i_configMediumAttachment(PCFGMNODE pCtlInst,
-                                      const char *pcszDevice,
+int Console::i_configMediumAttachment(const char *pcszDevice,
                                       unsigned uInstance,
                                       StorageBus_T enmBus,
@@ -3571 +3569 @@
         HRESULT hrc;
         Bstr    bstr;
+        PCFGMNODE pCtlInst = NULL;
 
 // #define RC_CHECK()  AssertMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc\n", rc), rc)
@@ -3589 +3588 @@
         PCFGMNODE pLunL0 = NULL;
         hrc = Console::i_convertBusPortDeviceToLun(enmBus, lPort, lDev, uLUN);                H();
+
+        /* Determine the base path for the device instance. */
+        if (enmBus != StorageBus_USB)
+            pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "Devices/%s/%u/", pcszDevice, uInstance);
+        else
+        {
+            /* If we hotplug a USB device create a new CFGM tree. */
+            if (!fHotplug)
+                pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "USB/%s/", pcszDevice, uInstance);
+            else
+                pCtlInst = CFGMR3CreateTree(pUVM);
+        }
+        AssertReturn(pCtlInst, VERR_INTERNAL_ERROR);
 
         if (enmBus == StorageBus_USB)
@@ -4007 +4019 @@
         if (paLedDevType)
             paLedDevType[uLUN] = lType;
+
+        /* Dump the changed LUN if possible, dump the complete device otherwise */
+        if (   aMachineState != MachineState_Starting
+            && aMachineState != MachineState_Restoring)
+            CFGMR3Dump(pLunL0 ? pLunL0 : pCtlInst);
     }
     catch (ConfigError &x)