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

Timestamp:

Feb 2, 2015 9:17:31 PM (10 years ago)

Author:

vboxsync

Message:

Main: Fix i_configMediumAttachment inconsistency for USB storage devices

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (6 diffs)
• ConsoleImpl2.cpp (modified) (5 diffs)

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

@@ -3675 +3675 @@
     AssertReturn(enmVMState == VMSTATE_SUSPENDED, VERR_INVALID_STATE);
 
-    /* Determine the base path for the device instance. */
-    PCFGMNODE pCtlInst;
-    if (strcmp(pcszDevice, "Msd"))
-        pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "Devices/%s/%u/", pcszDevice, uInstance);
-    else
-        pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "USB/%s/", pcszDevice, uInstance);
-    AssertReturn(pCtlInst, VERR_INTERNAL_ERROR);
-
-    PCFGMNODE pLunL0 = NULL;
-    int rc = pThis->i_configMediumAttachment(pCtlInst,
-                                             pcszDevice,
+    int rc = pThis->i_configMediumAttachment(pcszDevice,
                                              uInstance,
                                              enmBus,
@@ -3701 +3691 @@
                                              pUVM,
                                              NULL /* paLedDevType */,
-                                             &pLunL0);
-    /* Dump the changed LUN if possible, dump the complete device otherwise */
-    CFGMR3Dump(pLunL0 ? pLunL0 : pCtlInst);
-
+                                             NULL /* ppLunL0 */);
     LogFlowFunc(("Returning %Rrc\n", rc));
     return rc;
@@ -3863 +3850 @@
     AssertReturn(enmVMState == VMSTATE_SUSPENDED, VERR_INVALID_STATE);
 
-    /*
-     * Determine the base path for the device instance. USB Msd devices are handled different
-     * because the PDM USB API requires a differnet CFGM tree when attaching a new USB device.
-     */
-    PCFGMNODE pCtlInst;
-
-    if (enmBus == StorageBus_USB)
-        pCtlInst = CFGMR3CreateTree(pUVM);
-    else
-        pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "Devices/%s/%u/", pcszDevice, uInstance);
-
-    AssertReturn(pCtlInst, VERR_INTERNAL_ERROR);
-
-    PCFGMNODE pLunL0 = NULL;
-    int rc = pThis->i_configMediumAttachment(pCtlInst,
-                                             pcszDevice,
+    int rc = pThis->i_configMediumAttachment(pcszDevice,
                                              uInstance,
                                              enmBus,
@@ -3894 +3866 @@
                                              pUVM,
                                              NULL /* paLedDevType */,
-                                             &pLunL0);
-    /* Dump the changed LUN if possible, dump the complete device otherwise */
-    if (enmBus != StorageBus_USB)
-        CFGMR3Dump(pLunL0 ? pLunL0 : pCtlInst);
-
+                                             NULL);
     LogFlowFunc(("Returning %Rrc\n", rc));
     return rc;
@@ -9702 +9670 @@
         return VINF_SUCCESS;
 
-    /* Determine the base path for the device instance. */
-    PCFGMNODE pCtlInst;
-
-    if (enmBus == StorageBus_USB)
-        pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "USB/%s/", pcszDevice);
-    else
-        pCtlInst = CFGMR3GetChildF(CFGMR3GetRootU(pUVM), "Devices/%s/%u/", pcszDevice, uInstance);
-
-    AssertReturn(pCtlInst, VERR_INTERNAL_ERROR);
-
     /* Update the device instance configuration. */
-    PCFGMNODE pLunL0 = NULL;
-    int rc = pThis->i_configMediumAttachment(pCtlInst,
-                                             pcszDevice,
+    int rc = pThis->i_configMediumAttachment(pcszDevice,
                                              uInstance,
                                              enmBus,
@@ -9731 +9687 @@
                                              pUVM,
                                              NULL /* paLedDevType */,
-                                             &pLunL0);
-    /* Dump the changed LUN if possible, dump the complete device otherwise */
-    CFGMR3Dump(pLunL0 ? pLunL0 : pCtlInst);
+                                             NULL /* ppLunL0)*/);
     if (RT_FAILURE(rc))
     {

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)