diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-07-21 03:38:23 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-07-21 03:38:23 +0000 |
| commit | 4a91a079b71fb7a08b82195adc2a318e8f40b281 (patch) | |
| tree | 5ccdb93a6b111561a3ab310108980e2961241325 /sys/arch/amd64/conf | |
| parent | 9a2c07687402a907387ffdfd0a83a9993b76ffbc (diff) | |
Add pvbus(4), a pseudo-bus to attach non-PCI paravirtual devices and buses.
vmt(4) is moved from mainbus0 to pvbus0, more devices will follow.
OK sf@ deraadt@
Diffstat (limited to 'sys/arch/amd64/conf')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index cb96cf9aa6d..33e8361c22d 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.390 2015/07/19 18:17:06 bmercer Exp $ +# $OpenBSD: GENERIC,v 1.391 2015/07/21 03:38:22 reyk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -38,6 +38,7 @@ isa0 at pcib? isa0 at amdpcib? isa0 at tcpcib? pci* at mainbus0 +pvbus0 at mainbus0 acpi0 at bios0 acpitimer* at acpi? @@ -64,7 +65,8 @@ aibs* at acpi? mpbios0 at bios0 ipmi0 at mainbus? disable # IPMI -vmt0 at mainbus? # VMware Tools + +vmt0 at pvbus? # VMware Tools option PCIVERBOSE option USBVERBOSE diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 270dffd2cb7..57942f9410c 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.78 2015/07/17 22:52:28 tedu Exp $ +# $OpenBSD: files.amd64,v 1.79 2015/07/21 03:38:22 reyk Exp $ maxpartitions 16 maxusers 2 16 128 @@ -234,8 +234,10 @@ include "dev/onewire/files.onewire" # attach ipmi at mainbus -# VMware Tools -attach vmt at mainbus +# +# Paravirtual device bus +# +include "dev/pv/files.pv" # # device major numbers |