[src/bouyer-xenpvh]: src/sys/arch/i386/conf Fix build after merge

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be2b47981f8e
branches:  bouyer-xenpvh
changeset: 1024991:be2b47981f8e
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Apr 20 19:38:54 2020 +0000

description:
Fix build after merge

diffstat:

 sys/arch/i386/conf/std.i386 |  4 ++--
 sys/arch/i386/conf/std.xen  |  7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r efed4c82febb -r be2b47981f8e sys/arch/i386/conf/std.i386
--- a/sys/arch/i386/conf/std.i386       Mon Apr 20 19:38:11 2020 +0000
+++ b/sys/arch/i386/conf/std.i386       Mon Apr 20 19:38:54 2020 +0000
@@ -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        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?
diff -r efed4c82febb -r be2b47981f8e sys/arch/i386/conf/std.xen
--- a/sys/arch/i386/conf/std.xen        Mon Apr 20 19:38:11 2020 +0000
+++ b/sys/arch/i386/conf/std.xen        Mon Apr 20 19:38:54 2020 +0000
@@ -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"