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/i386/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/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 13767a85c8f..a2378e6fc4d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.800 2015/07/19 18:17:06 bmercer Exp $ +# $OpenBSD: GENERIC,v 1.801 2015/07/21 03:38:22 reyk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -42,10 +42,12 @@ acpi0 at bios? mpbios0 at bios0 pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose ipmi0 at mainbus? disable # IPMI -vmt0 at mainbus? # VMware Tools esm0 at mainbus? # Dell Embedded Server Management amdmsr0 at mainbus? # MSR access for AMD Geode LX CPUs with GP +pvbus0 at mainbus0 # Paravirtual device bus +vmt0 at pvbus? # VMware Tools + acpitimer* at acpi? acpihpet* at acpi? acpiac* at acpi? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index a1b2c3b8b1c..25e96b1cbfe 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.224 2015/07/17 22:52:28 tedu Exp $ +# $OpenBSD: files.i386,v 1.225 2015/07/21 03:38:22 reyk Exp $ # # new style config file for i386 architecture # @@ -392,8 +392,10 @@ file arch/i386/i386/acpi_wakecode.S acpi & !small_kernel # attach ipmi at mainbus -# VMware Tools -attach vmt at mainbus +# +# Paravirtual device bus +# +include "dev/pv/files.pv" # Dell Embedded Systems Management device esm |