Changeset 13985 in vbox

Timestamp:

Nov 9, 2008 2:28:38 PM (16 years ago)

Author:

vboxsync

Message:

Main: Handle SATA controller too when doing snapshots

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6862 +6862 @@
     hrc = hda->COMGETTER(Channel)(&lChannel);                                   H();
 
-    int iLUN;
+    int         iLUN;
+    const char *pcszDevice = NULL;
+
     switch (enmBus)
     {
@@ -6880 +6882 @@
 
             iLUN = 2*lChannel + lDev;
+            pcszDevice = "piix3ide";
             break;
         }
@@ -6885 +6888 @@
         {
             iLUN = lChannel;
+            pcszDevice = "ahci";
             break;
         }
@@ -6899 +6903 @@
      */
     PCFGMNODE pCfg;
-    PCFGMNODE pLunL1 = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/piix3ide/0/LUN#%d/AttachedDriver/", iLUN);
+    PCFGMNODE pLunL1;
+
+    pLunL1 = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/0/LUN#%d/AttachedDriver/", pcszDevice, iLUN);
+
     if (!pLunL1)
     {
-        PCFGMNODE pInst = CFGMR3GetChild(CFGMR3GetRoot(pVM), "Devices/piix3ide/0/");
+        PCFGMNODE pInst = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/0/", pcszDevice);
         AssertReturn(pInst, VERR_INTERNAL_ERROR);
 
@@ -6998 +7005 @@
          * Detach the driver and replace the config node.
          */
-        rc = PDMR3DeviceDetach(pVM, "piix3ide", 0, iLUN);                           RC_CHECK();
+        rc = PDMR3DeviceDetach(pVM, pcszDevice, 0, iLUN);                            RC_CHECK();
         CFGMR3RemoveNode(pCfg);
         rc = CFGMR3InsertNode(pLunL1, "Config", &pCfg);                             RC_CHECK();
@@ -7036 +7043 @@
      * Attach the new driver.
      */
-    rc = PDMR3DeviceAttach(pVM, "piix3ide", 0, iLUN, NULL);                     RC_CHECK();
+    rc = PDMR3DeviceAttach(pVM, pcszDevice, 0, iLUN, NULL);                      RC_CHECK();
 
     LogFlowFunc (("Returns success\n"));