Changeset 35920 in vbox for trunk/src/VBox

Timestamp:

Feb 9, 2011 5:14:11 PM (14 years ago)

Author:

vboxsync

Message:

PCI: Linux driver

Location:

trunk/src/VBox/HostDrivers

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxPci (added)
• VBoxPci/Makefile.kmk (added)
• VBoxPci/VBoxPci.c (added)
• VBoxPci/VBoxPciInternal.h (added)
• linux/Makefile (modified) (5 diffs)
• linux/dkms.conf (modified) (1 diff)
• linux/export_modules (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -40 +40 @@
  ifeq ($(KBUILD_TARGET),darwin)
   include $(PATH_SUB_CURRENT)/darwin/Makefile.kmk
+ endif
+
+ if1of ($(KBUILD_TARGET), linux)
+  ifdef VBOX_WITH_PCI_PASSTHROUGH
+   include $(PATH_SUB_CURRENT)/VBoxPci/Makefile.kmk
+  endif
  endif
 

trunk/src/VBox/HostDrivers/linux/Makefile

@@ -27 +27 @@
  obj-m += vboxnetadp/
 endif
-
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
+ obj-m += vboxpci/
+endif
 else # ! KBUILD_EXTMOD
 
@@ -57 +59 @@
             echo; \
         fi
+        @if [ -d vboxpci ]; then \
+            if [ -f vboxdrv/Module.symvers ]; then \
+                cp vboxdrv/Module.symvers vboxpci; \
+            fi; \
+            echo "*** Building 'vboxpci' module ***"; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci; \
+            cp vboxpci/vboxpci.ko .; \
+            echo; \
+        fi
 
 
@@ -67 +78 @@
             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \
         fi
+        @if [ -d vboxpci ]; then \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \
+        fi
 
 clean:
@@ -76 +90 @@
             $(MAKE) -C vboxnetadp clean; \
         fi
-        rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko
+        @if [ -d vboxpci ]; then \
+            $(MAKE) -C vboxpci clean; \
+        fi
+        rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko vboxpci.ko 
 
 unload:
-        @for module in vboxnetadp vboxnetflt vboxdrv; do \
+        @for module in vboxnetadp vboxnetflt vboxdrv vboxpci; do \
                 if grep "^$$module " /proc/modules >/dev/null; then \
                         echo "Removing previously installed $$module module"; \
@@ -87 +104 @@
 
 load: unload
-        @for module in vboxdrv vboxnetflt vboxnetadp; do \
+        @for module in vboxdrv vboxnetflt vboxnetadp vboxpci; do \
                 if test -f $$module.ko; then \
                         echo "Installing $$module module"; \

trunk/src/VBox/HostDrivers/linux/dkms.conf

@@ -30 +30 @@
 _OMIT_VBOXNETADP_BUILT_MODULE_LOCATION[2]="vboxnetadp"
 _OMIT_VBOXNETADP_DEST_MODULE_LOCATION[2]="/kernel/misc"
+
+_OMIT_VBOXPCI_BUILT_MODULE_NAME[1]="vboxpci"
+_OMIT_VBOXPCI_BUILT_MODULE_LOCATION[1]="vboxpci"
+_OMIT_VBOXPCI_DEST_MODULE_LOCATION[1]="/kernel/misc"

trunk/src/VBox/HostDrivers/linux/export_modules

@@ -34 +34 @@
 PATH_VBOXNET="$PATH_ROOT/src/VBox/HostDrivers/VBoxNetFlt"
 PATH_VBOXADP="$PATH_ROOT/src/VBox/HostDrivers/VBoxNetAdp"
+PATH_VBOXPCI="$PATH_ROOT/src/VBox/HostDrivers/VBoxPci"
 
 VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
@@ -39 +40 @@
 VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
 VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`                                                                                                        VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                                     VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                         VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                                   VBOX_C_YEAR=`date +%Y`                                                                                                 
+VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`                                                                                                        VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                                     VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                         VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`                                   VBOX_C_YEAR=`date +%Y`
 
 . $PATH_VBOXDRV/linux/files_vboxdrv
 . $PATH_VBOXNET/linux/files_vboxnetflt
 . $PATH_VBOXADP/linux/files_vboxnetadp
+. $PATH_VBOXPCI/linux/files_vboxpci
 
 # Temporary path for creating the modules, will be removed later
@@ -124 +126 @@
 fi
 
+# vboxpci (VirtualBox host PCI access kernel module)
+mkdir $PATH_TMP/vboxpci || exit 1
+for f in $VBOX_VBOXPCI_SOURCES; do
+    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`"
+done
+sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_LINUX/build_in_tmp > $PATH_TMP/vboxpci/build_in_tmp
+chmod 0755 $PATH_TMP/vboxpci/build_in_tmp
+sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXPCI/linux/dkms.conf > $PATH_TMP/vboxpci/dkms.conf
+if [ -n "$VBOX_WITH_HARDENING" ]; then
+    cat                                   $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
+else
+    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
+fi
+
 install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile
 
@@ -136 +152 @@
 # Remove the temporary directory
 rm -r $PATH_TMP
-