Changeset 33688 in vbox for trunk/src/VBox/Main/BusAssignmentManager.cpp

Timestamp:

Nov 2, 2010 1:19:46 PM (14 years ago)

Author:

vboxsync

Message:

PIC: forgotten code to record assignment

File:

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

trunk/src/VBox/Main/BusAssignmentManager.cpp

@@ -30 +30 @@
     {
         char szDevName[16];
+
+        PciDeviceRecord(const char* pszName)
+        {
+            ::strncpy(szDevName, pszName, sizeof(szDevName));
+        }
     };
 
@@ -46 +51 @@
     HRESULT init(ChipsetType_T chipsetType);
 
+    HRESULT record(const char* pszName, PciBusAddress& Address);
     HRESULT autoAssign(const char* pszName, PciBusAddress& Address);
-    bool checkAvailable(PciBusAddress& Address);    
+    bool    checkAvailable(PciBusAddress& Address);
 };
 
@@ -53 +59 @@
 {
     mChipsetType = chipsetType;
+    return S_OK;
+}
+
+
+HRESULT BusAssignmentManager::State::record(const char* pszName, PciBusAddress& Address)
+{
+    mPciMap.insert(PciMap::value_type(Address, PciDeviceRecord(pszName)));
     return S_OK;
 }
@@ -66 +79 @@
 {
     PciMap::const_iterator it = mPciMap.find(Address);
-    
+
     return (it == mPciMap.end());
 }
@@ -123 +136 @@
 
 HRESULT BusAssignmentManager::assignPciDevice(const char* pszDevName, PCFGMNODE pCfg,
-                                           PciBusAddress& Address,    bool fAddressRequired)
+                                              PciBusAddress& Address,    bool fAddressRequired)
 {
     HRESULT rc = S_OK;
@@ -147 +160 @@
     Assert(Address.valid());
 
+    rc = pState->record(pszDevName, Address);
+    if (FAILED(rc))
+        return rc;
+
     rc = InsertConfigInteger(pCfg, "PCIBusNo",             Address.iBus);
     if (FAILED(rc))