Changeset 33690 in vbox

Timestamp:

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

Author:

vboxsync

Message:

PCI: more slot management bits

Location:

trunk/src/VBox/Main

Files:

• BusAssignmentManager.cpp (modified) (5 diffs)
• ConsoleImpl2.cpp (modified) (2 diffs)
• include/BusAssignmentManager.h (modified) (4 diffs)

trunk/src/VBox/Main/BusAssignmentManager.cpp

@@ -24 +24 @@
 
 #include <map>
+#include <vector>
 
 struct BusAssignmentManager::State
@@ -35 +36 @@
             ::strncpy(szDevName, pszName, sizeof(szDevName));
         }
+
+        bool operator<(const PciDeviceRecord &a) const
+        {
+            return ::strcmp(szDevName, a.szDevName) < 0;
+        }
+
+        bool operator==(const PciDeviceRecord &a) const
+        {
+            return ::strcmp(szDevName, a.szDevName) == 0;
+        }
     };
 
-    typedef std::map <PciBusAddress, PciDeviceRecord > PciMap;
+    typedef std::map <PciBusAddress,PciDeviceRecord > PciMap;
+    typedef std::vector<PciBusAddress>                PciAddrList;
+    typedef std::map <PciDeviceRecord,PciAddrList >   ReversePciMap;
 
     volatile int32_t cRefCnt;
     ChipsetType_T    mChipsetType;
     PciMap           mPciMap;
+    ReversePciMap    mReversePciMap;
 
     State()
@@ -54 +68 @@
     HRESULT autoAssign(const char* pszName, PciBusAddress& Address);
     bool    checkAvailable(PciBusAddress& Address);
+    bool    findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address);
 };
 
@@ -65 +80 @@
 HRESULT BusAssignmentManager::State::record(const char* pszName, PciBusAddress& Address)
 {
-    mPciMap.insert(PciMap::value_type(Address, PciDeviceRecord(pszName)));
-    return S_OK;
+    PciDeviceRecord devRec(pszName);
+
+    /* Remember address -> device mapping */
+    mPciMap.insert(PciMap::value_type(Address, devRec));
+
+    ReversePciMap::iterator it = mReversePciMap.find(devRec);
+    if (it == mReversePciMap.end())
+    {
+        mReversePciMap.insert(ReversePciMap::value_type(devRec, PciAddrList()));
+        it = mReversePciMap.find(devRec);
+    }
+
+    /* Remember device name -> addresses mapping */
+    it->second.push_back(Address);
+
+    return S_OK;
+}
+
+bool    BusAssignmentManager::State::findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address)
+{
+    PciDeviceRecord devRec(pszDevName);
+
+    ReversePciMap::iterator it = mReversePciMap.find(devRec);
+    if (it == mReversePciMap.end())
+        return false;
+
+    if (iInstance >= (int)it->second.size())
+        return false;
+
+    Address = it->second[iInstance];
+    return true;
 }
 
@@ -176 +220 @@
     return S_OK;
 }
+
+
+bool BusAssignmentManager::findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address)
+{
+    return pState->findPciAddress(pszDevName, iInstance, Address);
+}

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -966 +966 @@
             InsertConfigNode(pDevices, "lpc", &pDev);
             InsertConfigNode(pDev,     "0", &pInst);
+#if 0
+            PciAddr = PciBusAddress(0, 31, 0);
+            hrc = BusMgr->assignPciDevice("lpc", pInst);                               H();
+#endif
             InsertConfigInteger(pInst, "Trusted",   1); /* boolean */
         }
@@ -2307 +2311 @@
             if (fOsXGuest && fAudioEnabled)
             {
-                /** @todo: don't hardcode */
-                uint32_t u32AudioPciAddr = (5 << 16) | 0;
-                InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
+                PciBusAddress Address;
+                if (BusMgr->findPciAddress("hda", 0, Address))
+                {
+                    uint32_t u32AudioPciAddr = (Address.iDevice << 16) | Address.iFn;
+                    InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
+                }
             }
             InsertConfigInteger(pCfg,  "IocPciAddress", u32IocPciAddress);

trunk/src/VBox/Main/include/BusAssignmentManager.h

@@ -49 +49 @@
         if (iBus < a.iBus)
             return true;
-        
+
         if (iBus > a.iBus)
             return false;
@@ -55 +55 @@
         if (iDevice < a.iDevice)
             return true;
-        
+
         if (iDevice > a.iDevice)
             return false;
@@ -61 +61 @@
         if (iFn < a.iFn)
             return true;
-        
+
         if (iFn > a.iFn)
             return false;
@@ -110 +110 @@
         return assignPciDevice(pszDevName, pCfg, Address, false);
     }
+    virtual bool findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address);
 };