Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Define xen devices in i386/conf/majors.i386. This m...
details: https://anonhg.NetBSD.org/src/rev/ce8a6da7d903
branches: trunk
changeset: 574770:ce8a6da7d903
user: bouyer <bouyer%NetBSD.org@localhost>
date: Fri Mar 11 20:44:37 2005 +0000
description:
Define xen devices in i386/conf/majors.i386. This makes sure there won't
be conflics with regular i386 kernels.
diffstat:
sys/arch/i386/conf/majors.i386 | 16 ++++-
sys/arch/xen/conf/files.xen | 4 +-
sys/arch/xen/conf/majors.i386 | 116 -----------------------------------------
sys/arch/xen/conf/majors.xen | 12 ----
4 files changed, 15 insertions(+), 133 deletions(-)
diffs (179 lines):
diff -r 14968e2de31f -r ce8a6da7d903 sys/arch/i386/conf/majors.i386
--- a/sys/arch/i386/conf/majors.i386 Fri Mar 11 20:39:39 2005 +0000
+++ b/sys/arch/i386/conf/majors.i386 Fri Mar 11 20:44:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: majors.i386,v 1.23 2003/12/10 02:04:01 jmc Exp $
+# $NetBSD: majors.i386,v 1.24 2005/03/11 20:44:37 bouyer Exp $
#
# Device majors for i386
#
@@ -108,6 +108,16 @@
device-major ct char 106 block 23 ct
device-major mt char 107 block 24 mt
-# Majors up to 143 are reserved for machine-dependant drivers.
-# New machine-independant driver majors are assigned in
+#
+# Device majors for Xen. These are assigned here so that:
+# - we are sure there are no conflicts with plain i386
+# - they appear in the i386 MAKEDEV
+#
+
+device-major xenevt char 141 xenevt
+device-major xbd char 142 block 142 xbd
+device-major xencons char 143 xencons
+
+# Majors up to 143 are reserved for machine-dependent drivers.
+# New machine-independent driver majors are assigned in
# sys/conf/majors.
diff -r 14968e2de31f -r ce8a6da7d903 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen Fri Mar 11 20:39:39 2005 +0000
+++ b/sys/arch/xen/conf/files.xen Fri Mar 11 20:44:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.17 2005/03/09 22:39:20 bouyer Exp $
+# $NetBSD: files.xen,v 1.18 2005/03/11 20:44:37 bouyer Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -262,4 +262,4 @@
file arch/xen/xen/isa_machdep.c hypervisor & dom0ops
file arch/xen/xen/xenevt.c xenevt & dom0ops
-include "arch/xen/conf/majors.i386"
+include "arch/i386/conf/majors.i386"
diff -r 14968e2de31f -r ce8a6da7d903 sys/arch/xen/conf/majors.i386
--- a/sys/arch/xen/conf/majors.i386 Fri Mar 11 20:39:39 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-# $NetBSD: majors.i386,v 1.1 2004/03/11 21:44:08 cl Exp $
-# NetBSD: majors.i386,v 1.23 2003/12/10 02:04:01 jmc Exp
-#
-# Device majors for Xen/i386
-#
-
-device-major cons char 0
-device-major ctty char 1
-device-major mem char 2
-device-major wd char 3 block 0 wd
-device-major swap char 4 block 1
-device-major pts char 5 pty
-device-major ptc char 6 pty
-device-major log char 7
-device-major com char 8 com
-device-major fd char 9 block 2 fdc
-device-major wt char 10 block 3 wt
-device-major scd char 11 block 15 scd
-device-major pc char 12 pc
-device-major sd char 13 block 4 sd
-device-major st char 14 block 5 st
-device-major cd char 15 block 6 cd
-device-major lpt char 16 lpt
-device-major ch char 17 ch
-device-major ccd char 18 block 16 ccd
-device-major ss char 19 ss
-device-major uk char 20 uk
-device-major apm char 21 apm
-device-major filedesc char 22
-device-major bpf char 23 bpfilter
-device-major md char 24 block 17 md
-
-device-major joy char 26 joy
-device-major spkr char 27 spkr
-device-major lkm char 28 lkm
-
-# next three are obsolete
-#device-major omms char 35 omms
-#device-major olms char 36 olms
-#device-major opms char 37 opms
-device-major cy char 38 cy
-device-major mcd char 39 block 7 mcd
-device-major tun char 40 tun
-device-major vnd char 41 block 14 vnd
-device-major audio char 42 audio
-device-major svr4_net char 43 compat_svr4
-device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
-device-major rnd char 46 rnd
-device-major wsdisplay char 47 wsdisplay
-device-major wskbd char 48 wskbd
-device-major wsmouse char 49 wsmouse
-device-major isdn char 50 isdn
-device-major isdnctl char 51 isdnctl
-device-major isdnbchan char 52 isdnbchan
-device-major isdntrc char 53 isdntrc
-device-major isdntel char 54 isdntel
-device-major usb char 55 usb
-device-major uhid char 56 uhid
-device-major ulpt char 57 ulpt
-device-major midi char 58 midi
-device-major sequencer char 59 sequencer
-device-major vcoda char 60 vcoda
-device-major scsibus char 61 scsibus
-device-major raid char 62 block 18 raid
-device-major esh char 63 esh
-device-major ugen char 64 ugen
-device-major wsmux char 65 wsmux
-device-major ucom char 66 ucom
-device-major sysmon char 67 sysmon_envsys | sysmon_wdog | sysmon_power
-device-major vmegeneric char 68 vmegeneric
-device-major ld char 69 block 19 ld
-device-major urio char 70 urio
-device-major bktr char 71 bktr
-
-device-major cz char 73 cz
-device-major ses char 74 ses
-device-major uscanner char 75 uscanner
-device-major iop char 76 iop
-device-major altq char 77 altq
-device-major mlx char 78 mlx
-device-major ed char 79 block 20 ed_mca
-device-major mly char 80 mly
-device-major wsfont char 81 wsfont
-device-major agp char 82 agp
-device-major pci char 83 pci
-device-major dpti char 84 dpti
-device-major irframe char 85 irframedrv
-device-major cir char 86 cir
-device-major radio char 87 radio
-# major 88 free
-device-major clockctl char 89 clockctl
-device-major systrace char 90 systrace
-device-major kttcp char 91 kttcp
-device-major dmoverio char 92 dmoverio
-device-major cgd char 93 block 21 cgd
-device-major verifiedexec char 94 verifiedexec
-device-major fwiso char 95 fwiso
-device-major dpt char 96 dpt
-device-major twe char 97 twe
-device-major nsmb char 98 nsmb
-device-major vmmon char 99 vmmon
-device-major vmnet char 100 vmnet
-device-major ksyms char 101 ksyms
-device-major icp char 102 icp
-device-major gpib char 103 gpib
-device-major ppi char 104 ppi
-device-major rd char 105 block 22 rd
-device-major ct char 106 block 23 ct
-device-major mt char 107 block 24 mt
-
-include "arch/xen/conf/majors.xen"
-
-# Majors up to 143 are reserved for machine-dependant drivers.
-# New machine-independant driver majors are assigned in
-# sys/conf/majors.
diff -r 14968e2de31f -r ce8a6da7d903 sys/arch/xen/conf/majors.xen
--- a/sys/arch/xen/conf/majors.xen Fri Mar 11 20:39:39 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: majors.xen,v 1.4 2005/03/09 22:39:20 bouyer Exp $
-#
-# Device majors for Xen
-#
-
-device-major xenevt char 141 xenevt
-device-major xbd char 142 block 142 xbd
-device-major xencons char 143 xencons
-
-# Majors up to 143 are reserved for machine-dependant drivers.
-# New machine-independant driver majors are assigned in
-# sys/conf/majors.
Home |
Main Index |
Thread Index |
Old Index