summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2020-05-26 14:03:21 +0000
committerjdolecek <jdolecek@NetBSD.org>2020-05-26 14:03:21 +0000
commit048f437fbf205ab206300a1b343ff40e60d689ce (patch)
tree50193a31e04087d14ca81120407881440580a6c5 /sys
parenta7d29e9f589323ef5b99a065d26607043b4d897d (diff)
put back NO_PCI_MSI_MSIX, need to fix MSI issues reported in PR port-xen/55285
first
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/XEN3_DOM05
-rw-r--r--sys/arch/i386/conf/XEN3PAE_DOM03
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 17c80dfb960..6fa3da6994e 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.180 2020/05/22 16:17:42 jdolecek Exp $
+# $NetBSD: XEN3_DOM0,v 1.181 2020/05/26 14:03:21 jdolecek Exp $
include "arch/amd64/conf/std.xen"
@@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.180 $"
+#ident "XEN3_DOM0-$Revision: 1.181 $"
maxusers 32 # estimated number of users
@@ -224,6 +224,7 @@ pci* at hypervisor? bus ?
pci* at pchb? bus ?
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
+options NO_PCI_MSI_MSIX
# pci backend devices, used for PCI pass-through. To export a PCI device
# to a domU, the device has to be attached to the pciback driver in the dom0.
diff --git a/sys/arch/i386/conf/XEN3PAE_DOM0 b/sys/arch/i386/conf/XEN3PAE_DOM0
index eb909cfa50a..a53ed4de60f 100644
--- a/sys/arch/i386/conf/XEN3PAE_DOM0
+++ b/sys/arch/i386/conf/XEN3PAE_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.28 2020/05/22 16:17:42 jdolecek Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.29 2020/05/26 14:03:21 jdolecek Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -212,6 +212,7 @@ balloon* at xenbus? # Xen balloon device
# PCI bus support
pci* at hypervisor? bus ?
pci* at pchb? bus ?
+options NO_PCI_MSI_MSIX
# PCI bridges
ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter,