diff options
| author |   dlg <dlg@openbsd.org> | 2013-10-21 05:52:15 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2013-10-21 05:52:15 +0000 |
| commit | 1fe604818f531953be816930b166cbf44589f0b3 (patch) | |
| tree | 8f0130e8b2dc0262b6ce4829463a2ed2688088fa /sys | |
| parent | remove a space that snuck into the output (diff) | |
| download | wireguard-openbsd-1fe604818f531953be816930b166cbf44589f0b3.tar.xz wireguard-openbsd-1fe604818f531953be816930b166cbf44589f0b3.zip | |
enable support for VMware ParaVirtual SCSI via vmwpvs(4).
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 71489b98bb2..fc3a77ebc10 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.349 2013/09/08 02:53:40 reyk Exp $ +# $OpenBSD: GENERIC,v 1.350 2013/10/21 05:52:15 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -360,6 +360,7 @@ siop* at pci? # NCR 538XX SCSI controllers adw* at pci? # AdvanSys ULTRA WIDE SCSI pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #trm* at pci? # Tekram DC-3x5U SCSI Controllers +vmwpvs* at pci? # VMware ParaVirtual SCSI scsibus* at scsi? sd* at scsibus? # SCSI disk drives diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index b523610e7e6..5d8901096cb 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.128 2013/09/08 02:53:40 reyk Exp $ +# $OpenBSD: RAMDISK_CD,v 1.129 2013/10/21 05:52:15 dlg Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -187,6 +187,7 @@ siop* at pci? # NCR 538XX SCSI controllers(new) adw* at pci? # AdvanSys ULTRA WIDE SCSI pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #trm* at pci? # Tekram DC-3x5U SCSI Controllers +vmwpvs* at pci? # VMware ParaVirtual SCSI softraid0 at root # Software RAID # I2O diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 55209196de3..07e4e3a1f12 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.756 2013/09/14 01:37:02 guenther Exp $ +# $OpenBSD: GENERIC,v 1.757 2013/10/21 05:52:15 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -469,6 +469,7 @@ uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers uha* at eisa? # UltraStor 24f SCSI controllers wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 +vmwpvs* at pci? # VMware ParaVirtual SCSI scsibus* at scsi? sd* at scsibus? # SCSI disk drives diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 4d163fa0dc2..29b73da41fc 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.202 2013/10/05 17:05:16 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.203 2013/10/21 05:52:15 dlg Exp $ machine i386 # architecture, used by config; REQUIRED @@ -230,6 +230,7 @@ uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers uha* at eisa? # UltraStor 24f SCSI controllers #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 +vmwpvs* at pci? # VMware ParaVirtual SCSI softraid0 at root # Software RAID # I2O |