Module Name: src
Committed By: bouyer
Date: Sat Apr 25 15:03:18 UTC 2020
Modified Files:
src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC
src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC
Removed Files:
src/sys/arch/amd64/conf [bouyer-xenpvh]: GENERIC_XENHVM XEN3_PVHVM
src/sys/arch/i386/conf [bouyer-xenpvh]: GENERIC_XENHVM XEN3PAE_PVHVM
Log Message:
Merge GENERIC_XENHVM in GENERIC.
Remove XEN3_PVHVM/XEN3PAE_PVHVM files which have been obsolete for some time
on the branch
To generate a diff of this commit:
cvs rdiff -u -r1.564.2.1 -r1.564.2.2 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1.2.5 -r0 src/sys/arch/amd64/conf/GENERIC_XENHVM
cvs rdiff -u -r1.3.2.3 -r0 src/sys/arch/amd64/conf/XEN3_PVHVM
cvs rdiff -u -r1.1227.2.1 -r1.1227.2.2 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.1.2.2 -r0 src/sys/arch/i386/conf/GENERIC_XENHVM
cvs rdiff -u -r1.3.2.3 -r0 src/sys/arch/i386/conf/XEN3PAE_PVHVM
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
diff -u src/sys/arch/amd64/conf/GENERIC:1.564.2.1 src/sys/arch/amd64/conf/GENERIC:1.564.2.2
--- src/sys/arch/amd64/conf/GENERIC:1.564.2.1 Mon Apr 20 11:28:51 2020
+++ src/sys/arch/amd64/conf/GENERIC Sat Apr 25 15:03:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.564.2.1 2020/04/20 11:28:51 bouyer Exp $
+# $NetBSD: GENERIC,v 1.564.2.2 2020/04/25 15:03:17 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.564.2.1 $"
+#ident "GENERIC-$Revision: 1.564.2.2 $"
maxusers 64 # estimated number of users
@@ -89,6 +89,15 @@ hyperv0 at cpu0 # Microsoft Hyper-V
powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
vmt0 at cpu0 # VMware Tools
+#Xen PV support for HVM guests
+options XENPVHVM
+options XEN
+hypervisor* at mainbus? # Xen hypervisor
+xenbus* at hypervisor? # Xen virtual bus
+xencons* at hypervisor? # Xen virtual console
+xennet* at xenbus? # Xen virtual network interface
+xbd* at xenbus? # Xen virtual block device
+
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
#options BUFQ_READPRIO
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1227.2.1 src/sys/arch/i386/conf/GENERIC:1.1227.2.2
--- src/sys/arch/i386/conf/GENERIC:1.1227.2.1 Mon Apr 20 19:38:11 2020
+++ src/sys/arch/i386/conf/GENERIC Sat Apr 25 15:03:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1227.2.1 2020/04/20 19:38:11 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1227.2.2 2020/04/25 15:03:18 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1227.2.1 $"
+#ident "GENERIC-$Revision: 1.1227.2.2 $"
maxusers 64 # estimated number of users
@@ -44,6 +44,15 @@ powernow0 at cpu0 # AMD PowerNow! and C
viac7temp* at cpu? # VIA C7 temperature sensor
vmt0 at cpu0 # VMware Tools
+#Xen PV support for HVM guests
+options XENPVHVM
+options XEN
+hypervisor* at mainbus? # Xen hypervisor
+xenbus* at hypervisor? # Xen virtual bus
+xencons* at hypervisor? # Xen virtual console
+xennet* at xenbus? # Xen virtual network interface
+xbd* at xenbus? # Xen virtual block device
+
options MTRR # memory-type range register syscall support
options MULTIBOOT # Multiboot support (see multiboot(8))
