Module Name: src
Committed By: jakllsch
Date: Sun Mar 16 18:04:57 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOMU
src/sys/arch/i386/conf: XEN3_DOMU
Log Message:
Disable xpci(4) PCI passthrough in XEN3_DOMU kernels by popular demand.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/conf/XEN3_DOMU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.51 src/sys/arch/amd64/conf/XEN3_DOMU:1.52
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.51 Sat Mar 15 13:50:01 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Mar 16 18:04:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.51 2014/03/15 13:50:01 jakllsch Exp $
+# $NetBSD: XEN3_DOMU,v 1.52 2014/03/16 18:04:56 jakllsch Exp $
include "arch/amd64/conf/std.xen"
@@ -167,8 +167,8 @@ balloon* at xenbus? # Xen balloon devic
xencons* at hypervisor? # Xen virtual console
# PCI pass-through support:
-xpci* at xenbus ? #Xen3 PCI front end driver
-pci* at xpci ?
+#xpci* at xenbus ? #Xen3 PCI front end driver
+#pci* at xpci ?
# you then need to add your PCI devices drivers below.
cinclude "arch/amd64/conf/GENERIC.local"
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.56 src/sys/arch/i386/conf/XEN3_DOMU:1.57
--- src/sys/arch/i386/conf/XEN3_DOMU:1.56 Sun Jan 26 19:16:16 2014
+++ src/sys/arch/i386/conf/XEN3_DOMU Sun Mar 16 18:04:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.56 2014/01/26 19:16:16 dsl Exp $
+# $NetBSD: XEN3_DOMU,v 1.57 2014/03/16 18:04:56 jakllsch Exp $
include "arch/xen/conf/std.xen"
@@ -258,6 +258,6 @@ options PAX_MPROTECT=0 # PaX mprotect(
options PAX_ASLR=0 # PaX Address Space Layout Randomization
# PCI pass-through support:
-xpci* at xenbus ? #Xen3 PCI front end driver
-pci* at xpci ?
+#xpci* at xenbus ? #Xen3 PCI front end driver
+#pci* at xpci ?
# you then need to add your PCI devices drivers below.