Changeset 37781 in vbox for trunk/src/VBox/Devices/build

Timestamp:

Jul 5, 2011 1:35:29 PM (14 years ago)

Author:

vboxsync

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

72657

Message:

PCI passthrough fixes

Location:

trunk/src/VBox/Devices/build

Files:

• VBoxDD.cpp (modified) (5 diffs)
• VBoxDD.h (modified) (1 diff)

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -180 +180 @@
 #endif
 
-#ifdef VBOX_WITH_PCI_PASSTHROUGH
+#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciRaw);
     if (RT_FAILURE(rc))
@@ -230 +230 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifndef RT_OS_L4
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNAT);
     if (RT_FAILURE(rc))
         return rc;
-#endif
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
@@ -275 +273 @@
 #endif
 
-#if !defined(RT_OS_L4)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNamedPipe);
     if (RT_FAILURE(rc))
@@ -285 +282 @@
     if (RT_FAILURE(rc))
         return rc;
-#endif
 
 #if defined(RT_OS_LINUX)
@@ -315 +311 @@
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvDiskIntegrity);
     if (RT_FAILURE(rc))
+        return rc;
+#endif
+
+#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvPciRaw);
+    if (RT_FAILURED(rc))
         return rc;
 #endif

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -84 +84 @@
 extern const PDMDEVREG g_DeviceEFI;
 #endif
-#ifdef VBOX_WITH_PCI_PASSTHROUGH
+#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
 extern const PDMDEVREG g_DevicePciRaw;
 #endif