Changeset 7457 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 14, 2008 12:17:16 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28895

Message:

AHCI: add configuration options for VBoxManage and fix two mistakes

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• SATAControllerImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -606 +606 @@
             rc = CFGMR3InsertNode(pDevices, "ahci", &pDev);                             RC_CHECK();
             rc = CFGMR3InsertNode(pDev,     "0", &pSataInst);                           RC_CHECK();
-            rc = CFGMR3InsertInteger(pIdeInst, "Trusted",              1);              RC_CHECK();
-            rc = CFGMR3InsertInteger(pIdeInst, "PCIDeviceNo",          13);             RC_CHECK();
+            rc = CFGMR3InsertInteger(pSataInst, "Trusted",              1);             RC_CHECK();
+            rc = CFGMR3InsertInteger(pSataInst, "PCIDeviceNo",          13);            RC_CHECK();
             Assert(!afPciDeviceNo[13]);
             afPciDeviceNo[13] = true;
-            rc = CFGMR3InsertInteger(pIdeInst, "PCIFunctionNo",        1);              RC_CHECK();
-            rc = CFGMR3InsertNode(pIdeInst,    "Config", &pCfg);                        RC_CHECK();
+            rc = CFGMR3InsertInteger(pSataInst, "PCIFunctionNo",        0);             RC_CHECK();
+            rc = CFGMR3InsertNode(pSataInst,    "Config", &pCfg);                       RC_CHECK();
 
             for (uint32_t i = 0; i < 4; i++)

trunk/src/VBox/Main/SATAControllerImpl.cpp

@@ -223 +223 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    /* the machine needs to be mutable */
-    Machine::AutoMutableStateDependency adep (mParent);
-    CheckComRCReturnRC (adep.rc());
-    AutoLock alock (this);
-
     switch (DevicePosition)
     {