Module Name:src
Committed By: bouyer
Date: Mon Apr 20 19:38:54 UTC 2020
Modified Files:
src/sys/arch/i386/conf [bouyer-xenpvh]: std.i386 std.xen
Log Message:
Fix build after merge
To generate a diff of this commit:
cvs rdiff -u -r1.35.26.1 -r1.35.26.2 src/sys/arch/i386/conf/std.i386
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/arch/i386/conf/std.xen
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/i386/conf/std.i386
diff -u src/sys/arch/i386/conf/std.i386:1.35.26.1 src/sys/arch/i386/conf/std.i386:1.35.26.2
--- src/sys/arch/i386/conf/std.i386:1.35.26.1 Thu Apr 16 08:46:34 2020
+++ src/sys/arch/i386/conf/std.i386 Mon Apr 20 19:38:54 2020
@@ -1,9 +1,10 @@
-# $NetBSD: std.i386,v 1.35.26.1 2020/04/16 08:46:34 bouyer Exp $
+# $NetBSD: std.i386,v 1.35.26.2 2020/04/20 19:38:54 bouyer Exp $
#
# standard, required NetBSD/i386 'options'
machine i386 x86 xen
include "conf/std" # MI standard options
+include "arch/xen/conf/std.xenversion"
options CPU_IN_CKSUM
options EXEC_AOUT # exec a.out binaries
@@ -18,7 +19,6 @@ options MPBIOS # configure CPUs and A
options CHILD_MAX=1024 # 160 is too few
options OPEN_MAX=1024 # 128 is too few
-options __XEN_INTERFACE_VERSION__=0x00030208 # Xen 3.1 interface
mainbus0 at root
cpu* at mainbus?
Index: src/sys/arch/i386/conf/std.xen
diff -u src/sys/arch/i386/conf/std.xen:1.1.4.2 src/sys/arch/i386/conf/std.xen:1.1.4.3
--- src/sys/arch/i386/conf/std.xen:1.1.4.2 Mon Apr 20 11:28:57 2020
+++ src/sys/arch/i386/conf/std.xen Mon Apr 20 19:38:54 2020
@@ -1,10 +1,13 @@
-# $NetBSD: std.xen,v 1.1.4.2 2020/04/20 11:28:57 bouyer Exp $
+# $NetBSD: std.xen,v 1.1.4.3 2020/04/20 19:38:54 bouyer Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
-machine xen i386
+machine xen i386 x86
include "conf/std" # MI standard options
+include "arch/xen/conf/files.xen.pv"
+
+options XEN #Xen support
include "arch/xen/conf/std.xenversion"
