Module Name: src
Committed By: jym
Date: Fri Apr 29 01:51:53 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU
Log Message:
Enable balloon(4) for Xen kernels.
ok bouyer@; shortly discussed on port-xen@.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/conf/XEN3_DOMU
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/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.66 src/sys/arch/amd64/conf/XEN3_DOM0:1.67
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.66 Mon Apr 18 01:36:24 2011
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Apr 29 01:51:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.66 2011/04/18 01:36:24 jym Exp $
+# $NetBSD: XEN3_DOM0,v 1.67 2011/04/29 01:51:53 jym Exp $
include "arch/amd64/conf/std.xen"
@@ -203,7 +203,7 @@
xenbus* at hypervisor? # Xen virtual bus
xencons* at hypervisor? # Xen virtual console
-#balloon* at xenbus? # Xen balloon device
+balloon* at xenbus? # Xen balloon device
acpi0 at hypervisor?
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.28 src/sys/arch/amd64/conf/XEN3_DOMU:1.29
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.28 Mon Apr 18 01:36:24 2011
+++ src/sys/arch/amd64/conf/XEN3_DOMU Fri Apr 29 01:51:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.28 2011/04/18 01:36:24 jym Exp $
+# $NetBSD: XEN3_DOMU,v 1.29 2011/04/29 01:51:53 jym Exp $
include "arch/amd64/conf/std.xen"
@@ -157,7 +157,7 @@
xenbus* at hypervisor? # Xen virtual bus
xennet* at xenbus? # Xen virtual network interface
xbd* at xenbus? # Xen virtual block device
-#balloon* at xenbus? # Xen balloon device
+balloon* at xenbus? # Xen balloon device
xencons* at hypervisor? # Xen virtual console
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.50 src/sys/arch/i386/conf/XEN3_DOM0:1.51
--- src/sys/arch/i386/conf/XEN3_DOM0:1.50 Tue Apr 26 16:57:40 2011
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Apr 29 01:51:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.50 2011/04/26 16:57:40 joerg Exp $
+# $NetBSD: XEN3_DOM0,v 1.51 2011/04/29 01:51:52 jym Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -216,7 +216,7 @@
xencons* at hypervisor? # Xen virtual console
#xennet* at hypervisor? # Xen virtual network interface
-#balloon* at xenbus? # Xen balloon device
+balloon* at xenbus? # Xen balloon device
#xbd* at hypervisor? # Xen virtual block device
#wd* at hypervisor? # Xen vbd (wd identity)
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.33 src/sys/arch/i386/conf/XEN3_DOMU:1.34
--- src/sys/arch/i386/conf/XEN3_DOMU:1.33 Tue Apr 26 16:57:40 2011
+++ src/sys/arch/i386/conf/XEN3_DOMU Fri Apr 29 01:51:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.33 2011/04/26 16:57:40 joerg Exp $
+# $NetBSD: XEN3_DOMU,v 1.34 2011/04/29 01:51:52 jym Exp $
include "arch/xen/conf/std.xen"
@@ -181,7 +181,7 @@
xenbus* at hypervisor? # Xen virtual bus
xennet* at xenbus? # Xen virtual network interface
xbd* at xenbus? # Xen virtual block device
-#balloon* at xenbus? # Xen balloon device
+balloon* at xenbus? # Xen balloon device
cinclude "arch/i386/conf/GENERIC.local"
