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

Timestamp:

Apr 8, 2011 6:41:51 PM (14 years ago)

Author:

vboxsync

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

71093

Message:

PCI: Main and VBoxManage work

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-client/BusAssignmentManager.cpp (modified) (2 diffs)
• src-client/ConsoleImpl2.cpp (modified) (6 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4704 +4704 @@
         and most information will be delivered as IHostPciDevicePlugEvent
         on IVirtualBox event source.
-        <note>
-          Not yet implemented.
-        </note>
 
         <see>IHostPciDevicePlugEvent</see>
@@ -4738 +4735 @@
         will be delivered. As currently we don't support hot device
         unplug, IHostPciDevicePlugEvent event is delivered immediately.
-
-        <note>
-          Not yet implemented.
-        </note>
 
         <see>IHostPciDevicePlugEvent</see>

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

@@ -376 +376 @@
         const DeviceAssignmentRule* rule = matchingRules[iRule];
 
-        Address.iBus = rule->iBus;
-        Address.iDevice = rule->iDevice;
-        Address.iFn = rule->iFn;
+        Address.miBus = rule->iBus;
+        Address.miDevice = rule->iDevice;
+        Address.miFn = rule->iFn;
 
         if (checkAvailable(Address))
             return S_OK;
     }
-    AssertMsg(false, ("All possible candidate positions for %s exhausted\n", pszName));
+    AssertMsgFailed(("All possible candidate positions for %s exhausted\n", pszName));
 
     return E_INVALIDARG;
@@ -490 +490 @@
         return rc;
 
-    rc = InsertConfigInteger(pCfg, "PCIBusNo",      GuestAddress.iBus);
+    rc = InsertConfigInteger(pCfg, "PCIBusNo",      GuestAddress.miBus);
     if (FAILED(rc))
         return rc;
-    rc = InsertConfigInteger(pCfg, "PCIDeviceNo",   GuestAddress.iDevice);
+    rc = InsertConfigInteger(pCfg, "PCIDeviceNo",   GuestAddress.miDevice);
     if (FAILED(rc))
         return rc;
-    rc = InsertConfigInteger(pCfg, "PCIFunctionNo", GuestAddress.iFn);
+    rc = InsertConfigInteger(pCfg, "PCIFunctionNo", GuestAddress.miFn);
     if (FAILED(rc))
         return rc;

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

@@ -485 +485 @@
         Assert(GuestPciAddress.valid());
 
-        if (GuestPciAddress.iBus > 0)
+        if (GuestPciAddress.miBus > 0)
         {
             int iBridgesMissed = 0;
-            int iBase = GuestPciAddress.iBus - 1;
+            int iBase = GuestPciAddress.miBus - 1;
 
             while (!BusMgr->hasPciDevice("ich9pcibridge", iBase) && iBase > 0)
@@ -547 +547 @@
 
         InsertConfigInteger(pCfg,      "DetachHostDriver",  1);
-        InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPciAddress.iBus);
-        InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPciAddress.iDevice);
-        InsertConfigInteger(pCfg,      "HostPCIFunctionNo", HostPciAddress.iFn);
+        InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPciAddress.miBus);
+        InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPciAddress.miDevice);
+        InsertConfigInteger(pCfg,      "HostPCIFunctionNo", HostPciAddress.miFn);
 
         GuestPciAddress.fromLong(guest);
@@ -557 +557 @@
             return hrc;
 
-        InsertConfigInteger(pCfg,      "GuestPCIBusNo",      GuestPciAddress.iBus);
-        InsertConfigInteger(pCfg,      "GuestPCIDeviceNo",   GuestPciAddress.iDevice);
-        InsertConfigInteger(pCfg,      "GuestPCIFunctionNo", GuestPciAddress.iFn);
+        InsertConfigInteger(pCfg,      "GuestPCIBusNo",      GuestPciAddress.miBus);
+        InsertConfigInteger(pCfg,      "GuestPCIDeviceNo",   GuestPciAddress.miDevice);
+        InsertConfigInteger(pCfg,      "GuestPCIFunctionNo", GuestPciAddress.miFn);
 
         /* the Main driver */
@@ -1880 +1880 @@
                 InsertConfigNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);
                 InsertConfigInteger(pNetBtDevCfg, "NIC", it->mInstance);
-                InsertConfigInteger(pNetBtDevCfg, "PCIBusNo",      it->mPciAddress.iBus);
-                InsertConfigInteger(pNetBtDevCfg, "PCIDeviceNo",   it->mPciAddress.iDevice);
-                InsertConfigInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciAddress.iFn);
+                InsertConfigInteger(pNetBtDevCfg, "PCIBusNo",      it->mPciAddress.miBus);
+                InsertConfigInteger(pNetBtDevCfg, "PCIDeviceNo",   it->mPciAddress.miDevice);
+                InsertConfigInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciAddress.miFn);
             }
         }
@@ -2509 +2509 @@
             {
                 BootNic aNic = llBootNics.front();
-                uint32_t u32NicPciAddr = (aNic.mPciAddress.iDevice << 16) | aNic.mPciAddress.iFn;
+                uint32_t u32NicPciAddr = (aNic.mPciAddress.miDevice << 16) | aNic.mPciAddress.miFn;
                 InsertConfigInteger(pCfg, "NicPciAddress",    u32NicPciAddr);
             }
@@ -2517 +2517 @@
                 if (BusMgr->findPciAddress("hda", 0, Address))
                 {
-                    uint32_t u32AudioPciAddr = (Address.iDevice << 16) | Address.iFn;
+                    uint32_t u32AudioPciAddr = (Address.miDevice << 16) | Address.miFn;
                     InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
                 }

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5933 +5933 @@
         fireHostPciDevicePlugEvent(es, mid.raw(), false /* unplugged */, true /* success */, pAttach, NULL);
     }
-
-    return S_OK;
+    
+    return fRemoved ? S_OK : setError(VBOX_E_OBJECT_NOT_FOUND,
+                                      tr("No host PCI device %08x attached"),
+                                      hostAddress
+                                      );
 }