Module Name: src
Committed By: ryo
Date: Sat May 28 16:58:52 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC INSTALL INSTALL_XEN3_DOMU XEN3_DOM0
XEN3_DOMU
Log Message:
many whitespace cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.318 -r1.319 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/conf/INSTALL
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.318 src/sys/arch/amd64/conf/GENERIC:1.319
--- src/sys/arch/amd64/conf/GENERIC:1.318 Fri Apr 1 12:11:17 2011
+++ src/sys/arch/amd64/conf/GENERIC Sat May 28 16:58:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.318 2011/04/01 12:11:17 jruoho Exp $
+# $NetBSD: GENERIC,v 1.319 2011/05/28 16:58:51 ryo Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.318 $"
+#ident "GENERIC-$Revision: 1.319 $"
maxusers 64 # estimated number of users
@@ -100,13 +100,13 @@
# Because gcc omits the frame pointer for any -O level, the line below
# is needed to make backtraces in DDB work.
#
-makeoptions COPTS="-O2 -fno-omit-frame-pointer"
+makeoptions COPTS="-O2 -fno-omit-frame-pointer"
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions DEBUG="-g" # compile full symbol table
+#makeoptions DEBUG="-g" # compile full symbol table
#options SYSCALL_STATS # per syscall counts
#options SYSCALL_TIMES # per syscall times
#options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
@@ -180,7 +180,7 @@
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs ifmpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
#options ISO,TPIP # OSI
@@ -250,7 +250,7 @@
# enable VGA raster mode capable of displaying multilingual text on console
#options VGA_RASTERCONSOLE
# enable splash screen support; requires genfb or radeonfb
-#options SPLASHSCREEN
+#options SPLASHSCREEN
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -265,7 +265,7 @@
ipmi0 at mainbus?
# ACPI will be used if present. If not it will fall back to MPBIOS
-acpi0 at mainbus0
+acpi0 at mainbus0
options ACPI_SCANPCI # find PCI roots using ACPI
options MPBIOS # configure CPUs and APICs using MPBIOS
options MPBIOS_SCANPCI # MPBIOS configures PCI roots
@@ -276,14 +276,14 @@
options VGA_POST # in-kernel support for VGA POST
# ACPI devices
-acpiacad* at acpi? # ACPI AC Adapter
-acpibat* at acpi? # ACPI Battery
-acpibut* at acpi? # ACPI Button
+acpiacad* at acpi? # ACPI AC Adapter
+acpibat* at acpi? # ACPI Battery
+acpibut* at acpi? # ACPI Button
acpidalb* at acpi? # Direct Application Launch Button
acpiec* at acpi? # ACPI Embedded Controller (late)
-acpiecdt* at acpi? # ACPI Embedded Controller (early)
-acpifan* at acpi? # ACPI Fan
-acpilid* at acpi? # ACPI Lid Switch
+acpiecdt* at acpi? # ACPI Embedded Controller (early)
+acpifan* at acpi? # ACPI Fan
+acpilid* at acpi? # ACPI Lid Switch
#acpipmtr* at acpi? # ACPI Power Meter (experimental)
#acpismbus* at acpi? # ACPI SMBus CMI (experimental)
acpitz* at acpi? # ACPI Thermal Zone
@@ -296,27 +296,27 @@
aibs* at acpi? # ASUSTeK AI Booster hardware monitor
asus* at acpi? # ASUS hotkeys
attimer* at acpi? # AT Timer
-#com* at acpi? # Serial communications interface
-#fdc* at acpi? # Floppy disk controller
+#com* at acpi? # Serial communications interface
+#fdc* at acpi? # Floppy disk controller
fujbp* at acpi? # Fujitsu Brightness & Pointer
fujhk* at acpi? # Fujitsu Hotkeys
hpqlb* at acpi? # HP Quick Launch Buttons
hpet* at acpi? # High Precision Event Timer
joy* at acpi? # Joystick/Game port
-#lpt* at acpi? # Parallel port
+#lpt* at acpi? # Parallel port
mpu* at acpi? # Roland MPU-401 MIDI UART
-pckbc* at acpi? # PC keyboard controller
-pcppi* at acpi? # AT-style speaker sound
+pckbc* at acpi? # PC keyboard controller
+pcppi* at acpi? # AT-style speaker sound
sony* at acpi? # Sony Notebook Controller
-spic* at acpi? # Sony Programmable I/O Controller
-wsmouse* at spic? # mouse
+spic* at acpi? # Sony Programmable I/O Controller
+wsmouse* at spic? # mouse
thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
-ug* at acpi? # Abit uGuru Hardware monitor
+ug* at acpi? # Abit uGuru Hardware monitor
wb* at acpi? # Winbond W83L518D SD/MMC reader
sdmmc* at wb? # SD/MMC bus
wmidell* at acpiwmibus? # Dell WMI mappings
#wmihp* at acpiwmibus? # HP WMI mappings
-wmimsi* at acpiwmibus? # MSI WMI mappings
+wmimsi* at acpiwmibus? # MSI WMI mappings
# Basic Bus Support
@@ -333,22 +333,22 @@
puc* at pci? dev ? function ? # PCI "universal" comm. cards
#amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET
-#hpet* at amdpcib?
+#hpet* at amdpcib?
ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter,
# watchdog and Speedstep and HPET
fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
-#hpet* at ichlpcib?
+#hpet* at ichlpcib?
-aapic* at pci? dev ? function ? # AMD 8131 IO apic
+aapic* at pci? dev ? function ? # AMD 8131 IO apic
-agp* at pchb?
+agp* at pchb?
# ISA bus support
isa0 at mainbus?
isa0 at pcib?
-#isa0 at amdpcib?
-isa0 at ichlpcib?
+#isa0 at amdpcib?
+isa0 at ichlpcib?
# CardBus bridge support
cbb* at pci? dev ? function ?
@@ -382,11 +382,11 @@
# DRI driver
i915drm* at drm? # Intel i915, i945 DRM driver
mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
+mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
r128drm* at drm? # ATI Rage 128 DRM driver
radeondrm* at drm? # ATI Radeon DRM driver
savagedrm* at drm? # S3 Savage DRM driver
-sisdrm* at drm? # SiS DRM driver
+sisdrm* at drm? # SiS DRM driver
tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
# Cryptographic Devices
@@ -442,7 +442,7 @@
#lm* at wbsio?
# SMSC LPC47B397 hardware monitor functions
-#smsc0 at isa? port 0x02e
+#smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
#smscmon* at iic? addr 0x2c
@@ -453,7 +453,7 @@
#iic* at amdpm? # sensors below are on this bus
# NVIDIA nForce2/3/4 SMBus controller
-nfsmbc* at pci? dev ? function ?
+nfsmbc* at pci? dev ? function ?
nfsmb* at nfsmbc?
iic* at nfsmb?
@@ -462,7 +462,7 @@
iic* at piixpm? # SMBus on PIIX4
# Intel ICH SMBus controller
-ichsmb* at pci? dev ? function ?
+ichsmb* at pci? dev ? function ?
iic* at ichsmb?
# Thermal monitor and fan controller
@@ -471,7 +471,7 @@
#dbcool* at iic? addr 0x2E # Tyan S2882-D
# IBM Thinkpad Active Protection System
-#aps0 at isa? port 0x1600
+#aps0 at isa? port 0x1600
# Fintek Super I/O with hardware monitor
#finsio0 at isa? port 0x4e
@@ -545,7 +545,7 @@
# RAID controllers and devices
aac* at pci? dev ? function ? # Adaptec AAC family
amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID
-arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
+arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
cac* at pci? dev ? function ? # Compaq PCI array controllers
ciss* at pci? dev ? function ? # HP Smart Array controllers
icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID
@@ -578,7 +578,7 @@
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
-jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
+jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
ahcisata* at jmide?
mvsata* at pci? dev ? function ? # Marvell Hercules-I/II
optiide* at pci? dev ? function ? # Opti IDE controllers
@@ -586,9 +586,9 @@
pdcide* at pci? dev ? function ? # Promise IDE controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
-siisata* at pci? dev ? function ? # SiI SteelVine controllers
+siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
@@ -630,7 +630,7 @@
# ATA RAID configuration support, as found on some Promise controllers.
pseudo-device ataraid
-ld* at ataraid? vendtype ? unit ?
+ld* at ataraid? vendtype ? unit ?
# ATAPI devices
# flags have the same meaning as for IDE drives.
@@ -658,9 +658,9 @@
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11
atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11)
-bce* at pci? dev ? function ? # Broadcom 440x 10/100 Ethernet
-bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
-bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
+bce* at pci? dev ? function ? # Broadcom 440x 10/100 Ethernet
+bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
+bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
en* at pci? dev ? function ? # ENI/Adaptec ATM
@@ -693,8 +693,8 @@
rtw* at pci? dev ? function ? # Realtek 8180L (802.11)
sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet
sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet
-skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet
-sk* at skc? # SysKonnect SK9821 Gigabit Ethernet
+skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet
+sk* at skc? # SysKonnect SK9821 Gigabit Ethernet
ste* at pci? dev ? function ? # Sundance ST-201 Ethernet
stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 Gigabit
ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
@@ -705,7 +705,7 @@
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
wm* at pci? dev ? function ? # Intel 82543/82544 gigabit
-wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG
+wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG
xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE
# PCMCIA network interfaces
@@ -742,10 +742,10 @@
# MII/PHY support
acphy* at mii? phy ? # DAltima AC101 and AMD Am79c874 PHYs
-amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
atphy* at mii? phy ? # Attansic/Atheros PHYs
-bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs
-brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
@@ -754,18 +754,18 @@
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
-igphy* at mii? phy ? # Intel IGP01E1000
+igphy* at mii? phy ? # Intel IGP01E1000
ihphy* at mii? phy ? # Intel 82577 PHYs
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
-makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
nsphyter* at mii? phy ? # NS83843 PHYs
-pnaphy* at mii? phy ? # generic HomePNA PHYs
+pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
-rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs
+rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
@@ -803,7 +803,7 @@
uhub* at uhub? port ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -818,7 +818,7 @@
wskbd* at ukbd? console ? mux 1
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
uhid* at uhidev? reportid ?
@@ -831,7 +831,7 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# Option N.V. Wireless WAN modems
@@ -842,28 +842,28 @@
wd* at umass?
# USB audio
-uaudio* at uhub? port ? configuration ?
-uaudio* at usbifif?
+uaudio* at uhub? port ? configuration ?
+uaudio* at usbifif?
# USB MIDI
-umidi* at uhub? port ? configuration ?
+umidi* at uhub? port ? configuration ?
# USB IrDA
# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
+uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?
# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
+ustir* at uhub? port ?
irframe* at ustir?
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
axe* at uhub? port ? # ASIX AX88172 based adapters
-cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
+cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
url* at uhub? port ? # Realtek RTL8150L based adapters
@@ -877,24 +877,24 @@
ucom* at ubsa? portno ?
uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
-ucom* at uchcom? portno ?
+ucom* at uchcom? portno ?
-uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
-ucom* at uftdi? portno ?
+uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
+ucom* at uftdi? portno ?
-uipaq* at uhub? port ? # iPAQ PDAs
-ucom* at uipaq? portno ?
+uipaq* at uhub? port ? # iPAQ PDAs
+ucom* at uipaq? portno ?
-umct* at uhub? port ? # MCT USB-RS232 serial adapter
-ucom* at umct? portno ?
+umct* at uhub? port ? # MCT USB-RS232 serial adapter
+ucom* at umct? portno ?
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom? portno ?
+uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
+ucom* at uplcom? portno ?
-uslsa* at uhub? port ? # Silicon Labs USB-RS232 serial adapter
-ucom* at uslsa? portno ?
+uslsa* at uhub? port ? # Silicon Labs USB-RS232 serial adapter
+ucom* at uslsa? portno ?
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
+uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
ucom* at uvscom? portno ?
# RIM BlackBerry
@@ -904,7 +904,7 @@
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# Kyocera AIR-EDGE PHONE
@@ -918,17 +918,17 @@
atu* at uhub? port ? # Atmel at76c50x 802.11b
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
-rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
+rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
# Topfield TF5000PVR range of DVB recorders
-utoppy* at uhub? port ?
+utoppy* at uhub? port ?
# Y@P firmware loader
-uyap* at uhub? port ?
+uyap* at uhub? port ?
# D-Link DSB-R100 USB radio
udsbr* at uhub? port ?
@@ -943,20 +943,20 @@
ucom* at u3g?
# USB generic serial port (e.g., data over cellular)
-ugensa* at uhub? port ?
+ugensa* at uhub? port ?
ucom* at ugensa?
# IrDA and Consumer Ir devices
# Toshiba Oboe
-#oboe* at pci? dev ? function ? # broken -- vtophys
+#oboe* at pci? dev ? function ? # broken -- vtophys
#irframe* at oboe?
# PCI IEEE1394 controllers
-fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
+fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
# CardBus IEEE1394 controllers
-fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
+fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
@@ -970,12 +970,12 @@
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA AC'97 audio
-#azalia* at pci? dev ? function ? # High Definition Audio
+#azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
-emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
+emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
@@ -1076,10 +1076,10 @@
# SD/MMC/SDIO Controller and Device support
# SD/MMC controller
-sdhc* at pci? # SD Host Controller
-sdmmc* at sdhc? # SD/MMC bus
+sdhc* at pci? # SD Host Controller
+sdmmc* at sdhc? # SD/MMC bus
-ld* at sdmmc?
+ld* at sdmmc?
# Middle Digital, Inc. PCI-Weasel serial console board control
@@ -1126,7 +1126,7 @@
#pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device ifmpls # MPLS pseudo-interface
+#pseudo-device ifmpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.85 src/sys/arch/amd64/conf/INSTALL:1.86
--- src/sys/arch/amd64/conf/INSTALL:1.85 Wed Feb 16 20:23:21 2011
+++ src/sys/arch/amd64/conf/INSTALL Sat May 28 16:58:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.85 2011/02/16 20:23:21 jym Exp $
+# $NetBSD: INSTALL,v 1.86 2011/05/28 16:58:51 ryo Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/amd64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.85 $"
+#ident "INSTALL-$Revision: 1.86 $"
# INSTALL kernels do not have access to module(7)s. Compile some
# file-systems statically.
@@ -19,9 +19,9 @@
file-system MSDOSFS # MS-DOS file system
no options MEMORY_DISK_DYNAMIC
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
+options MEMORY_DISK_IS_ROOT # force root on memory disk
+options MEMORY_DISK_SERVER=0 # no userspace memory disk support
+options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
no options MTRR
Index: src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU
diff -u src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU:1.6 src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU:1.7
--- src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU:1.6 Fri Feb 6 18:50:26 2009
+++ src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU Sat May 28 16:58:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_XEN3_DOMU,v 1.6 2009/02/06 18:50:26 jym Exp $
+# $NetBSD: INSTALL_XEN3_DOMU,v 1.7 2011/05/28 16:58:51 ryo Exp $
#
# INSTALL_XEN3_DOMU - Installation kernel for Xen 3/DomU.
#
@@ -7,10 +7,10 @@
include "arch/amd64/conf/XEN3_DOMU"
-#ident "INSTALL-$Revision: 1.6 $"
+#ident "INSTALL-$Revision: 1.7 $"
options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
+options MEMORY_DISK_IS_ROOT # force root on memory disk
+options MEMORY_DISK_SERVER=0 # no userspace memory disk support
+options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.67 src/sys/arch/amd64/conf/XEN3_DOM0:1.68
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.67 Fri Apr 29 01:51:53 2011
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat May 28 16:58:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.67 2011/04/29 01:51:53 jym Exp $
+# $NetBSD: XEN3_DOM0,v 1.68 2011/05/28 16:58:51 ryo Exp $
include "arch/amd64/conf/std.xen"
@@ -46,15 +46,15 @@
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
-options DEBUG # expensive debugging checks/support
+options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
-makeoptions DEBUG="-g" # compile full symbol table
-makeoptions COPTS="-O2 -fno-omit-frame-pointer"
+makeoptions DEBUG="-g" # compile full symbol table
+makeoptions COPTS="-O2 -fno-omit-frame-pointer"
options DDB_COMMANDONENTER="trace;show registers"
# Compatibility options
@@ -65,7 +65,7 @@
options COMPAT_40 # NetBSD 4.0 compatibility.
options COMPAT_43 # and 4.3BSD
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_50 # NetBSD 5.0
+options COMPAT_50 # NetBSD 5.0
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
@@ -107,7 +107,7 @@
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support - Experimental
+options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
@@ -200,17 +200,17 @@
vcpu* at hypervisor? # Xen virtual CPUs
-xenbus* at hypervisor? # Xen virtual bus
+xenbus* at hypervisor? # Xen virtual bus
xencons* at hypervisor? # Xen virtual console
balloon* at xenbus? # Xen balloon device
-acpi0 at hypervisor?
+acpi0 at hypervisor?
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
options ACPI_SCANPCI # find PCI roots using ACPI
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
options ACPIVERBOSE # verbose ACPI configuration messages
-#options MIIVERBOSE # verbose PHY autoconfig messages
+#options MIIVERBOSE # verbose PHY autoconfig messages
options MPBIOS # configure CPUs and APICs using MPBIOS
options MPDEBUG # MPBIOS configures PCI roots
options MPVERBOSE # verbose MPBIOS autoconfig messages
@@ -218,19 +218,19 @@
#options PCI_ADDR_FIXUP # fixup PCI I/O addresses
#options PCI_BUS_FIXUP # fixup PCI bus numbering
#options PCI_INTR_FIXUP # fixup PCI interrupt routing
-#options PCIVERBOSE # verbose PCI device autoconfig messages
-#options USBVERBOSE # verbose USB device autoconfig messages
+#options PCIVERBOSE # verbose PCI device autoconfig messages
+#options USBVERBOSE # verbose USB device autoconfig messages
-ioapic* at mainbus? apid ?
+ioapic* at mainbus? apid ?
# ACPI devices
-acpiacad* at acpi? # ACPI AC Adapter
-acpibat* at acpi? # ACPI Battery
-acpibut* at acpi? # ACPI Button
+acpiacad* at acpi? # ACPI AC Adapter
+acpibat* at acpi? # ACPI Battery
+acpibut* at acpi? # ACPI Button
acpidalb* at acpi? # ACPI Direct Application Launch Button
acpiec* at acpi? # ACPI Embedded Controller
-acpilid* at acpi? # ACPI Lid Switch
-acpitz* at acpi? # ACPI Thermal Zone
+acpilid* at acpi? # ACPI Lid Switch
+acpitz* at acpi? # ACPI Thermal Zone
aibs* at acpi? # ASUSTeK AI Booster hardware monitor
hpqlb* at acpi? # HP Quick Launch Buttons
pckbc* at acpi? # PC keyboard controller
@@ -248,7 +248,7 @@
# pciback.hide=(bus:dev.fun)(bus:dev.func) to the dom0 kernel boot parameters.
# bus and dev are 2-digits hex number, func is a single-digit number:
# pciback.hide=(00:1a.0)(00:1a.1)(00:1a.7)
-pciback* at pci? #pci backend device
+pciback* at pci? # pci backend device
# PCI bridges
ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter,
@@ -259,7 +259,7 @@
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc* at pci? dev ? function ? # PCI "universal" comm. cards
-agp* at pchb?
+agp* at pchb?
# ISA bus support
isa0 at ichlpcib?
@@ -313,7 +313,7 @@
#lm* at wbsio?
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
-#viaenv* at pci? dev ? function ?
+#viaenv* at pci? dev ? function ?
# PCI network interfaces
@@ -322,9 +322,9 @@
ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet
ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11
atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11)
-bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet
-bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
-bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
+bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet
+bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
+bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
en* at pci? dev ? function ? # ENI/Adaptec ATM
ep* at pci? dev ? function ? # 3Com 3c59x
@@ -338,7 +338,7 @@
hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
-iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
+iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
@@ -416,27 +416,27 @@
# a machine hang with some controllers.
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
-aceride* at pci? dev ? function ? # Acer Lab IDE controllers
-ahcisata* at pci? dev ? function ? # AHCI SATA controllers
-artsata* at pci? dev ? function ? # Intel i31244 SATA controller
+aceride* at pci? dev ? function ? # Acer Lab IDE controllers
+ahcisata* at pci? dev ? function ? # AHCI SATA controllers
+artsata* at pci? dev ? function ? # Intel i31244 SATA controller
cmdide* at pci? dev ? function ? # CMD tech IDE controllers
cypide* at pci? dev ? function ? # Cypress IDE controllers
-geodeide* at pci? dev ? function ? # AMD Geode IDE controllers
+geodeide* at pci? dev ? function ? # AMD Geode IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
-ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
-jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
-ahcisata* at jmide?
-optiide* at pci? dev ? function ? # Opti IDE controllers
-piixide* at pci? dev ? function ? # Intel IDE controllers
+ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
+jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
+ahcisata* at jmide?
+optiide* at pci? dev ? function ? # Opti IDE controllers
+piixide* at pci? dev ? function ? # Intel IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
-svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
@@ -505,7 +505,7 @@
# RAID controllers and devices
aac* at pci? dev ? function ? # Adaptec AAC family
amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID
-arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
+arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
cac* at pci? dev ? function ? # Compaq PCI array controllers
ciss* at pci? dev ? function ? # HP Smart Array controllers
icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID
@@ -534,115 +534,115 @@
#machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver
wsdisplay* at vga? console ?
#wsdisplay* at pcdisplay? console ?
-#wsdisplay* at machfb? console ?
+#wsdisplay* at machfb? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
# USB Controller and Devices
# PCI USB controllers
-ehci* at pci? dev ? function ? # Enhanced Host Controller
-ohci* at pci? dev ? function ? # Open Host Controller
-uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
+ehci* at pci? dev ? function ? # Enhanced Host Controller
+ohci* at pci? dev ? function ? # Open Host Controller
+uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
-usb* at ehci?
-usb* at ohci?
-usb* at uhci?
+usb* at ehci?
+usb* at ohci?
+usb* at uhci?
# USB Hubs
-uhub* at usb?
-uhub* at uhub? port ?
+uhub* at usb?
+uhub* at uhub? port ?
# USB HID device
uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
-ums* at uhidev? reportid ?
+ums* at uhidev? reportid ?
wsmouse* at ums? mux 0
# USB eGalax touch-panel
-uep* at uhub? port ?
+uep* at uhub? port ?
wsmouse* at uep? mux 0
# USB Keyboards
-ukbd* at uhidev? reportid ?
-wskbd* at ukbd? console ? mux 1
+ukbd* at uhidev? reportid ?
+wskbd* at ukbd? console ? mux 1
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
-uhid* at uhidev? reportid ?
+uhid* at uhidev? reportid ?
# USB Printer
-ulpt* at uhub? port ? configuration ? interface ?
+ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
umodem* at uhub? port ? configuration ?
-ucom* at umodem?
+ucom* at umodem?
# Option N.V. Wireless WAN modems
uhso* at uhub? port ? configuration ?
# USB Mass Storage
-umass* at uhub? port ? configuration ? interface ?
-wd* at umass?
+umass* at uhub? port ? configuration ? interface ?
+wd* at umass?
# USB audio
uaudio* at uhub? port ? configuration ?
# USB MIDI
-umidi* at uhub? port ? configuration ?
+umidi* at uhub? port ? configuration ?
# USB IrDA
# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
+uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?
# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
+ustir* at uhub? port ?
irframe* at ustir?
# USB Ethernet adapters
-aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
-axe* at uhub? port ? # ASIX AX88172 based adapters
-cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
-cue* at uhub? port ? # CATC USB-EL1201A based adapters
-kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
-udav* at uhub? port ? # Davicom DM9601 based adapters
-url* at uhub? port ? # Realtek RTL8150L based adapters
+aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
+axe* at uhub? port ? # ASIX AX88172 based adapters
+cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
+cue* at uhub? port ? # CATC USB-EL1201A based adapters
+kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
+udav* at uhub? port ? # Davicom DM9601 based adapters
+url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
-atu* at uhub? port ? # Atmel AT76C50XX based adapters
+atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
-upl* at uhub? port ?
+upl* at uhub? port ?
# Serial adapters
-ubsa* at uhub? port ? # Belkin serial adapter
-ucom* at ubsa? portno ?
+ubsa* at uhub? port ? # Belkin serial adapter
+ucom* at ubsa? portno ?
-uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
-ucom* at uftdi? portno ?
+uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
+ucom* at uftdi? portno ?
-umct* at uhub? port ? # MCT USB-RS232 serial adapter
-ucom* at umct? portno ?
+umct* at uhub? port ? # MCT USB-RS232 serial adapter
+ucom* at umct? portno ?
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom? portno ?
+uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
+ucom* at uplcom? portno ?
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
-ucom* at uvscom? portno ?
+uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
+ucom* at uvscom? portno ?
# Diamond Multimedia Rio 500
-urio* at uhub? port ?
+urio* at uhub? port ?
# USB Handspring Visor
uvisor* at uhub? port ?
-ucom* at uvisor?
+ucom* at uvisor?
# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
@@ -655,20 +655,20 @@
usscanner* at uhub? port ?
# Y@P firmware loader
-uyap* at uhub? port ?
+uyap* at uhub? port ?
# D-Link DSB-R100 USB radio
-udsbr* at uhub? port ?
-radio* at udsbr?
+udsbr* at uhub? port ?
+radio* at udsbr?
# USB Generic driver
-ugen* at uhub? port ?
+ugen* at uhub? port ?
# PCI IEEE1394 controllers
-fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
+fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
# CardBus IEEE1394 controllers
-#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
+#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
@@ -766,7 +766,7 @@
pseudo-device accf_data # "dataready" accept filter
pseudo-device accf_http # "httpready" accept filter
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
@@ -826,7 +826,7 @@
pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
-pseudo-device drvctl
+pseudo-device drvctl
# xen pseudo-devices
pseudo-device xenevt
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.29 src/sys/arch/amd64/conf/XEN3_DOMU:1.30
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.29 Fri Apr 29 01:51:53 2011
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sat May 28 16:58:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.29 2011/04/29 01:51:53 jym Exp $
+# $NetBSD: XEN3_DOMU,v 1.30 2011/05/28 16:58:51 ryo Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@
maxusers 32 # estimated number of users
#
-options MAXPHYS=32768 #xbd doesn't handle 64k transfers
+options MAXPHYS=32768 #xbd doesn't handle 64k transfers
#options DOM0OPS
#options VM86 # virtual 8086 emulation
@@ -40,15 +40,15 @@
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
-options DEBUG # expensive debugging checks/support
+options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
-makeoptions DEBUG="-g" # compile full symbol table
-makeoptions COPTS="-O2 -fno-omit-frame-pointer"
+makeoptions DEBUG="-g" # compile full symbol table
+makeoptions COPTS="-O2 -fno-omit-frame-pointer"
options DDB_COMMANDONENTER="trace;show registers"
# Compatibility options
@@ -59,7 +59,7 @@
options COMPAT_40 # NetBSD 4.0 compatibility.
options COMPAT_43 # and 4.3BSD
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_50 # NetBSD 5.0
+options COMPAT_50 # NetBSD 5.0
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
@@ -94,7 +94,7 @@
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support - Experimental
+options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
@@ -154,14 +154,14 @@
hypervisor* at mainbus? # Xen hypervisor
vcpu* at hypervisor? # Xen virtual CPUs
-xenbus* at hypervisor? # Xen virtual bus
-xennet* at xenbus? # Xen virtual network interface
+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
xencons* at hypervisor? # Xen virtual console
-# PCI pass-through support:
+# PCI pass-through support:
#xpci* at xenbus ? #Xen3 PCI front end driver
#pci* at xpci ?
# you then need to add your PCI devices drivers below.
