Module Name: src
Committed By: bouyer
Date: Mon Apr 20 19:46:04 UTC 2020
Modified Files:
src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC_XENHVM
src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC_XENHVM
Log Message:
Thanks do jdolecek@, MAXPHYS is not restricted to 32k now.
Nothing prevents merging GENERIC_XENHVM in GENERIC now
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/amd64/conf/GENERIC_XENHVM
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/conf/GENERIC_XENHVM
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/GENERIC_XENHVM
diff -u src/sys/arch/amd64/conf/GENERIC_XENHVM:1.1.2.4 src/sys/arch/amd64/conf/GENERIC_XENHVM:1.1.2.5
--- src/sys/arch/amd64/conf/GENERIC_XENHVM:1.1.2.4 Thu Apr 16 17:50:51 2020
+++ src/sys/arch/amd64/conf/GENERIC_XENHVM Mon Apr 20 19:46:03 2020
@@ -1,10 +1,9 @@
-# $NetBSD: GENERIC_XENHVM,v 1.1.2.4 2020/04/16 17:50:51 bouyer Exp $
+# $NetBSD: GENERIC_XENHVM,v 1.1.2.5 2020/04/20 19:46:03 bouyer Exp $
include "arch/amd64/conf/GENERIC"
options XENPVHVM
options XEN
-options MAXPHYS=32768 #xbd doesn't handle 64k transfers
hypervisor* at mainbus? # Xen hypervisor
#vcpu* at hypervisor? # Xen virtual CPUs
xenbus* at hypervisor? # Xen virtual bus
Index: src/sys/arch/i386/conf/GENERIC_XENHVM
diff -u src/sys/arch/i386/conf/GENERIC_XENHVM:1.1.2.1 src/sys/arch/i386/conf/GENERIC_XENHVM:1.1.2.2
--- src/sys/arch/i386/conf/GENERIC_XENHVM:1.1.2.1 Thu Apr 16 08:46:34 2020
+++ src/sys/arch/i386/conf/GENERIC_XENHVM Mon Apr 20 19:46:04 2020
@@ -1,11 +1,10 @@
-# $NetBSD: GENERIC_XENHVM,v 1.1.2.1 2020/04/16 08:46:34 bouyer Exp $
+# $NetBSD: GENERIC_XENHVM,v 1.1.2.2 2020/04/20 19:46:04 bouyer Exp $
include "arch/i386/conf/GENERIC"
options XENPVHVM
options XEN
-options MAXPHYS=32768 #xbd doesn't handle 64k transfers
hypervisor* at mainbus? # Xen hypervisor
#vcpu* at hypervisor? # Xen virtual CPUs
xenbus* at hypervisor? # Xen virtual bus
