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

Timestamp:

Feb 28, 2011 6:24:32 PM (14 years ago)

Author:

vboxsync

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

70264

Message:

PCI: some Main work to provide correct attachment info for physical devices

Location:

trunk/src/VBox/Main/src-client

Files:

• BusAssignmentManager.cpp (modified) (6 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -219 +219 @@
     struct PciDeviceRecord
     {
-        char szDevName[32];
+        char          szDevName[32];
+        PciBusAddress HostAddress;
+
+        PciDeviceRecord(const char* pszName, PciBusAddress aHostAddress)
+        {
+            RTStrCopy(this->szDevName, sizeof(szDevName), pszName);
+            this->HostAddress = aHostAddress;
+        }
 
         PciDeviceRecord(const char* pszName)
         {
-            RTStrCopy(szDevName, sizeof(szDevName), pszName);
+            RTStrCopy(this->szDevName, sizeof(szDevName), pszName);
         }
 
@@ -255 +262 @@
     HRESULT init(ChipsetType_T chipsetType);
 
-    HRESULT record(const char* pszName, PciBusAddress& Address);
+    HRESULT record(const char* pszName, PciBusAddress& GuestAddress, PciBusAddress HostAddress);
     HRESULT autoAssign(const char* pszName, PciBusAddress& Address);
     bool    checkAvailable(PciBusAddress& Address);
@@ -271 +278 @@
 }
 
-HRESULT BusAssignmentManager::State::record(const char* pszName, PciBusAddress& Address)
-{
-    PciDeviceRecord devRec(pszName);
+HRESULT BusAssignmentManager::State::record(const char* pszName, PciBusAddress& Address, PciBusAddress HostAddress)
+{
+    PciDeviceRecord devRec(pszName, HostAddress);
 
     /* Remember address -> device mapping */
@@ -399 +406 @@
         dev.createObject();
         com::Bstr devname(it->second.szDevName);
-        dev->init(NULL, devname, -1, it->first.asLong(), FALSE);
+        dev->init(NULL, devname, 
+                  it->second.HostAddress.valid() ? it->second.HostAddress.asLong() : -1, 
+                  it->first.asLong(), it->second.HostAddress.valid());
         result.setElement(iIndex++, dev);
     }
@@ -449 +458 @@
 }
 
-HRESULT BusAssignmentManager::assignPciDevice(const char* pszDevName, PCFGMNODE pCfg,
-                                              PciBusAddress& Address,    bool fAddressRequired)
+HRESULT BusAssignmentManager::assignPciDeviceImpl(const char* pszDevName,
+                                                  PCFGMNODE pCfg,
+                                                  PciBusAddress& GuestAddress,
+                                                  PciBusAddress HostAddress,
+                                                  bool fGuestAddressRequired)
 {
     HRESULT rc = S_OK;
 
-    if (!Address.valid())
-        rc = pState->autoAssign(pszDevName, Address);
+    if (!GuestAddress.valid())
+        rc = pState->autoAssign(pszDevName, GuestAddress);
     else
     {
-        bool fAvailable = pState->checkAvailable(Address);
+        bool fAvailable = pState->checkAvailable(GuestAddress);
 
         if (!fAvailable)
         {
-            if (fAddressRequired)
+            if (fGuestAddressRequired)
                 rc = E_ACCESSDENIED;
             else
-                rc = pState->autoAssign(pszDevName, Address);
+                rc = pState->autoAssign(pszDevName, GuestAddress);
         }
     }
@@ -472 +484 @@
         return rc;
 
-    Assert(Address.valid() && pState->checkAvailable(Address));
-
-    rc = pState->record(pszDevName, Address);
+    Assert(GuestAddress.valid() && pState->checkAvailable(GuestAddress));
+
+    rc = pState->record(pszDevName, GuestAddress, HostAddress);
     if (FAILED(rc))
         return rc;
 
-    rc = InsertConfigInteger(pCfg, "PCIBusNo",             Address.iBus);
+    rc = InsertConfigInteger(pCfg, "PCIBusNo",      GuestAddress.iBus);
     if (FAILED(rc))
         return rc;
-    rc = InsertConfigInteger(pCfg, "PCIDeviceNo",          Address.iDevice);
+    rc = InsertConfigInteger(pCfg, "PCIDeviceNo",   GuestAddress.iDevice);
     if (FAILED(rc))
         return rc;
-    rc = InsertConfigInteger(pCfg, "PCIFunctionNo",        Address.iFn);
+    rc = InsertConfigInteger(pCfg, "PCIFunctionNo", GuestAddress.iFn);
     if (FAILED(rc))
         return rc;

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

@@ -532 +532 @@
         GuestPciAddress.fromLong(guest);
         Assert(GuestPciAddress.valid());
-        hrc = BusMgr->assignPciDevice("pciraw", pInst, GuestPciAddress, true);
+        hrc = BusMgr->assignHostPciDevice("pciraw", pInst, HostPciAddress, GuestPciAddress, true);
         if (hrc != S_OK)
             return hrc;