Module Name: src
Committed By: sborrill
Date: Mon Feb 15 18:04:11 UTC 2010
Modified Files:
src/sys/arch/amd64/conf [netbsd-5]: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf [netbsd-5]: XEN2_DOM0 XEN2_DOMU
Log Message:
Pull up the following revisions(s) (requested by tron in ticket #1306):
sys/arch/i386/conf/XEN2_DOM0 patch
sys/arch/i386/conf/XEN2_DOMU patch
sys/arch/amd64/conf/XEN3_DOM0 patch
sys/arch/amd64/conf/XEN3_DOM0 patch
Enable cgd(4) support on all amd64 and i386 XEN kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.33.4.3 -r1.33.4.4 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.53.2.3 -r1.53.2.4 src/sys/arch/i386/conf/XEN2_DOM0
cvs rdiff -u -r1.19.4.1 -r1.19.4.2 src/sys/arch/i386/conf/XEN2_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.33.4.3 src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.4
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.3 Sat Oct 3 23:57:54 2009
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Feb 15 18:04:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.33.4.3 2009/10/03 23:57:54 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.33.4.4 2010/02/15 18:04:11 sborrill Exp $
include "arch/amd64/conf/std.xen"
@@ -742,7 +742,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/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.1 src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.2
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.1 Sat Oct 3 23:55:43 2009
+++ src/sys/arch/amd64/conf/XEN3_DOMU Mon Feb 15 18:04:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.13.4.1 2009/10/03 23:55:43 snj Exp $
+# $NetBSD: XEN3_DOMU,v 1.13.4.2 2010/02/15 18:04:11 sborrill Exp $
include "arch/amd64/conf/std.xen"
@@ -177,7 +177,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/XEN2_DOM0
diff -u src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.3 src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.4
--- src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.3 Sat Sep 26 19:52:09 2009
+++ src/sys/arch/i386/conf/XEN2_DOM0 Mon Feb 15 18:04:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOM0,v 1.53.2.3 2009/09/26 19:52:09 snj Exp $
+# $NetBSD: XEN2_DOM0,v 1.53.2.4 2010/02/15 18:04:11 sborrill Exp $
include "arch/xen/conf/std.xen"
@@ -712,7 +712,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.19.4.1 src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.2
--- src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.1 Tue Nov 18 01:56:59 2008
+++ src/sys/arch/i386/conf/XEN2_DOMU Mon Feb 15 18:04:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOMU,v 1.19.4.1 2008/11/18 01:56:59 snj Exp $
+# $NetBSD: XEN2_DOMU,v 1.19.4.2 2010/02/15 18:04:11 sborrill Exp $
include "arch/xen/conf/std.xen"
@@ -187,7 +187,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.
