Module Name: src
Committed By: agc
Date: Tue Mar 24 22:42:50 UTC 2009
Modified Files:
src/sys/arch/i386/conf: XEN2_DOM0 XEN2_DOMU XEN3_DOM0 XEN3_DOMU
Log Message:
Catch up with the changes in i386 GENERIC, and enable cgd by default
in XEN2 and XEN3 kernels.
Xen really requires cgd, and as users are likely to get a domain given
to them without the possibility of recompiling a kernel for
themselves, we need to provide this by default.
As discussed with bouyer@, and with his OK.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/conf/XEN2_DOM0
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN2_DOMU
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.14 -r1.15 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/i386/conf/XEN2_DOM0
diff -u src/sys/arch/i386/conf/XEN2_DOM0:1.58 src/sys/arch/i386/conf/XEN2_DOM0:1.59
--- src/sys/arch/i386/conf/XEN2_DOM0:1.58 Fri Mar 6 20:31:49 2009
+++ src/sys/arch/i386/conf/XEN2_DOM0 Tue Mar 24 22:42:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOM0,v 1.58 2009/03/06 20:31:49 joerg Exp $
+# $NetBSD: XEN2_DOM0,v 1.59 2009/03/24 22:42:50 agc Exp $
include "arch/xen/conf/std.xen"
@@ -704,7 +704,7 @@
# disk/mass storage pseudo-devices
pseudo-device bio # RAID control device driver
pseudo-device ccd 4 # concatenated/striped disk devices
-#pseudo-device cgd 4 # cryptographic disk devices
+pseudo-device cgd 4 # cryptographic disk devices
pseudo-device raid 8 # RAIDframe disk driver
options RAID_AUTOCONFIG # auto-configuration of RAID components
# Options to enable various other RAIDframe RAID types.
Index: src/sys/arch/i386/conf/XEN2_DOMU
diff -u src/sys/arch/i386/conf/XEN2_DOMU:1.23 src/sys/arch/i386/conf/XEN2_DOMU:1.24
--- src/sys/arch/i386/conf/XEN2_DOMU:1.23 Fri Mar 6 20:31:49 2009
+++ src/sys/arch/i386/conf/XEN2_DOMU Tue Mar 24 22:42:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOMU,v 1.23 2009/03/06 20:31:49 joerg Exp $
+# $NetBSD: XEN2_DOMU,v 1.24 2009/03/24 22:42:50 agc Exp $
include "arch/xen/conf/std.xen"
@@ -184,7 +184,7 @@
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
-#pseudo-device cgd 4 # cryptographic disk devices
+pseudo-device cgd 4 # cryptographic disk devices
pseudo-device raid 8 # RAIDframe disk driver
options RAID_AUTOCONFIG # auto-configuration of RAID components
# Options to enable various other RAIDframe RAID types.
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.15 src/sys/arch/i386/conf/XEN3_DOM0:1.16
--- src/sys/arch/i386/conf/XEN3_DOM0:1.15 Fri Mar 6 10:37:42 2009
+++ src/sys/arch/i386/conf/XEN3_DOM0 Tue Mar 24 22:42:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.15 2009/03/06 10:37:42 cegger Exp $
+# $NetBSD: XEN3_DOM0,v 1.16 2009/03/24 22:42:50 agc Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -716,7 +716,7 @@
# disk/mass storage pseudo-devices
pseudo-device bio # RAID control device driver
pseudo-device ccd 4 # concatenated/striped disk devices
-#pseudo-device cgd 4 # cryptographic disk devices
+pseudo-device cgd 4 # cryptographic disk devices
pseudo-device raid 8 # RAIDframe disk driver
options RAID_AUTOCONFIG # auto-configuration of RAID components
# Options to enable various other RAIDframe RAID types.
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.14 src/sys/arch/i386/conf/XEN3_DOMU:1.15
--- src/sys/arch/i386/conf/XEN3_DOMU:1.14 Fri Mar 6 10:48:27 2009
+++ src/sys/arch/i386/conf/XEN3_DOMU Tue Mar 24 22:42:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.14 2009/03/06 10:48:27 cegger Exp $
+# $NetBSD: XEN3_DOMU,v 1.15 2009/03/24 22:42:50 agc Exp $
include "arch/xen/conf/std.xen"
@@ -192,7 +192,7 @@
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
-#pseudo-device cgd 4 # cryptographic disk devices
+pseudo-device cgd 4 # cryptographic disk devices
pseudo-device raid 8 # RAIDframe disk driver
options RAID_AUTOCONFIG # auto-configuration of RAID components
# Options to enable various other RAIDframe RAID types.
