Changeset 35685 in vbox

Timestamp:

Jan 24, 2011 3:56:51 PM (14 years ago)

Author:

vboxsync

Message:

Main, Device: passthrough conditional

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Bus/DevPciRaw.cpp (deleted)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Devices/build/VBoxDD.cpp (modified) (2 diffs)
• src/VBox/Devices/build/VBoxDD.h (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/src-client/VBoxDriversRegister.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -334 +334 @@
 # Enable Pulse support for Linux.
 VBOX_WITH_PULSE = 1
+# Enable PCI passthrough support
+VBOX_WITH_PCI_PASSTHROUGH = 1
 # Enable statically linked dbus support
 if1of ($(KBUILD_TARGET), linux solaris)
@@ -880 +882 @@
  VBOX_WITH_EHCI=
  VBOX_WITH_EXTPACK_PUEL=
+ VBOX_WITH_PCI_PASSTHROUGH=
  VBOX_WITH_OS2_ADDITIONS_BIN=
  VBOX_WITH_SECURELABEL=

trunk/src/VBox/Devices/Makefile.kmk

@@ -276 +276 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
-        Bus/DevPciRaw.cpp \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/DevPciRaw.cpp,) \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -541 +541 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
-        Bus/DevPciRaw.cpp \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/DevPciRaw.cpp,) \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -644 +644 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
-        Bus/DevPciRaw.cpp \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/DevPciRaw.cpp,) \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \

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

@@ -179 +179 @@
         return rc;
 #endif
+
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciRaw);
     if (RT_FAILURE(rc))
         return rc;
+#endif
 
     return VINF_SUCCESS;
@@ -349 +352 @@
     return rc;
 }
-

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

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

trunk/src/VBox/Main/Makefile.kmk

@@ -228 +228 @@
         $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
         $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
-        $(if $(VBOX_WITH_S3),VBOX_WITH_S3,)
+        $(if $(VBOX_WITH_S3),VBOX_WITH_S3,) \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \
@@ -585 +586 @@
         $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
         $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
-        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,)
+        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
 
 VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -637 +639 @@
         src-client/AudioSnifferInterface.cpp \
         src-client/BusAssignmentManager.cpp \
-        src-client/PciRawDevImpl.cpp \
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),src-client/PciRawDevImpl.cpp,) \
         src-client/ConsoleImpl.cpp \
         src-client/ConsoleImpl2.cpp \

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

@@ -26 +26 @@
 #include "AudioSnifferInterface.h"
 #include "ConsoleImpl.h"
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
 #include "PciRawDevImpl.h"
+#endif
 
 #include "Logging.h"
@@ -69 +71 @@
         return rc;
 
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
     rc = pCallbacks->pfnRegister(pCallbacks, &PciRawDev::DrvReg);
     if (RT_FAILURE(rc))
         return rc;
+#endif
 
     return VINF_SUCCESS;