[src/trunk]: src/sys/arch PR/51908: Kyle Amon: Allow customization of XEN ker...

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

details:   https://anonhg.NetBSD.org/src/rev/8faa849ab09c
branches:  trunk
changeset: 821083:8faa849ab09c
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 23 17:35:34 2017 +0000

description:
PR/51908: Kyle Amon: Allow customization of XEN kernels via .local files.

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0 |  3 ++-
 sys/arch/amd64/conf/XEN3_DOMU |  3 ++-
 sys/arch/i386/conf/XEN3_DOM0  |  3 ++-
 sys/arch/i386/conf/XEN3_DOMU  |  3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r f1aa1ccc289a -r 8faa849ab09c sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Mon Jan 23 15:32:04 2017 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Mon Jan 23 17:35:34 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.127 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: XEN3_DOM0,v 1.128 2017/01/23 17:35:34 christos Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -802,6 +802,7 @@
 ubsec* at pci? dev ? function ?        # Broadcom 5501/5601/580x/582x
 
 cinclude "arch/amd64/conf/GENERIC.local"
+cinclude "arch/amd64/conf/XEN3_DOM0.local"
 
 # Pseudo-Devices
 
diff -r f1aa1ccc289a -r 8faa849ab09c sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Mon Jan 23 15:32:04 2017 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Mon Jan 23 17:35:34 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.68 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: XEN3_DOMU,v 1.69 2017/01/23 17:35:34 christos Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -180,6 +180,7 @@
 # you then need to add your PCI devices drivers below.
 
 cinclude "arch/amd64/conf/GENERIC.local"
+cinclude "arch/amd64/conf/XEN3_DOMU.local"
 
 # Pseudo-Devices
 
diff -r f1aa1ccc289a -r 8faa849ab09c sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Mon Jan 23 15:32:04 2017 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Mon Jan 23 17:35:34 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: XEN3_DOM0,v 1.105 2017/01/12 05:24:36 ryo Exp $
+#      $NetBSD: XEN3_DOM0,v 1.106 2017/01/23 17:36:16 christos Exp $
 #
 #      XEN3_0: Xen 3.0 domain0 kernel
 
@@ -774,6 +774,7 @@
 ubsec* at pci? dev ? function ?        # Broadcom 5501/5601/580x/582x
 
 cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOM0.local"
 
 # Pseudo-Devices
 
diff -r f1aa1ccc289a -r 8faa849ab09c sys/arch/i386/conf/XEN3_DOMU
--- a/sys/arch/i386/conf/XEN3_DOMU      Mon Jan 23 15:32:04 2017 +0000
+++ b/sys/arch/i386/conf/XEN3_DOMU      Mon Jan 23 17:35:34 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.71 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: XEN3_DOMU,v 1.72 2017/01/23 17:36:16 christos Exp $
 
 include        "arch/xen/conf/std.xen"
 
@@ -197,6 +197,7 @@
 balloon*       at xenbus?              # Xen balloon device
 
 cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOMU.local"
 
 # Pseudo-Devices