diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2009-12-28 14:22:10 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2009-12-28 14:22:10 +0000 |
| commit | b92d40499336802df8e9324e33959da8ebf5ccfa (patch) | |
| tree | 107b25e22a6d1febd03570b16e8ce9a1ffe61ab6 /sys/arch/amd64 | |
| parent | 3eb56ed12b79d02ae89d6f9b5e4c82acfedeef91 (diff) | |
tweak vmt to work on amd64 as well as i386. like i386, it is still
commented out in GENERIC. it needs more love.
diff by david cranshaw a long time ago. sorry it has taken so long
for me to look at it.
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/mainbus.c | 14 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c index 524fdb71359..d304f540615 100644 --- a/sys/arch/amd64/amd64/mainbus.c +++ b/sys/arch/amd64/amd64/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.21 2009/11/23 15:34:48 deraadt Exp $ */ +/* $OpenBSD: mainbus.c,v 1.22 2009/12/28 14:22:09 dlg Exp $ */ /* $NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $ */ /* @@ -48,6 +48,7 @@ #include "ipmi.h" #include "bios.h" #include "mpbios.h" +#include "vmt.h" #include <machine/cpuvar.h> #include <machine/i82093var.h> @@ -59,6 +60,10 @@ #include <dev/ipmivar.h> #endif +#if NVMT > 0 +#include <dev/vmtvar.h> +#endif + #if NBIOS > 0 #include <machine/biosvar.h> #endif @@ -167,6 +172,13 @@ mainbus_attach(struct device *parent, struct device *self, void *aux) } #endif +#if NVMT > 0 + if (vmt_probe()) { + mba.mba_busname = "vmware"; + config_found(self, &mba.mba_busname, mainbus_print); + } +#endif + if ((cpu_info_primary.ci_flags & CPUF_PRESENT) == 0) { struct cpu_attach_args caa; diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index e20fe50cf3a..4f19bed42fd 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.282 2009/12/20 15:36:10 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.283 2009/12/28 14:22:09 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -59,6 +59,7 @@ acpipwrres* at acpi? mpbios0 at bios0 ipmi0 at mainbus? disable # IPMI +vmt0 at mainbus? # VMware Tools option PCIVERBOSE option USBVERBOSE diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 73ee392cd0c..425c156a675 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.54 2009/11/26 21:15:48 deraadt Exp $ +# $OpenBSD: files.amd64,v 1.55 2009/12/28 14:22:09 dlg Exp $ maxpartitions 16 maxusers 2 16 128 @@ -239,6 +239,9 @@ include "dev/onewire/files.onewire" # attach ipmi at mainbus +# VMware Tools +attach vmt at mainbus + # # device major numbers # |