summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2008-07-08 05:22:01 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2008-07-08 05:22:01 +0000
commit7140b2d09980706c85f1cd0a594223c42f8ab759 (patch)
treebb31ffbebaa62d50d3a235f240297fee5b003d57 /sys/arch/i386
parentd9164945f44bd657eb452cc80af592c276f9774d (diff)
vmt(4) is a kernel level implementation of the vmware tools.
it only provides the hosts machines clock as a timedelta sensor so far. getting it into the tree so people can work on it as suggested by fgsch@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/files.i3865
-rw-r--r--sys/arch/i386/i386/mainbus.c14
3 files changed, 19 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d38ecd1ece4..c3f068eddaf 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.630 2008/06/26 01:28:48 brad Exp $
+# $OpenBSD: GENERIC,v 1.631 2008/07/08 05:21:59 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -44,6 +44,7 @@ apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
acpi0 at bios?
pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
ipmi0 at mainbus? # 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
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index a49a3394367..2eb74d13a7c 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.181 2008/06/25 15:27:34 mbalmer Exp $
+# $OpenBSD: files.i386,v 1.182 2008/07/08 05:22:00 dlg Exp $
#
# new style config file for i386 architecture
#
@@ -430,6 +430,9 @@ file arch/i386/i386/acpi_machdep.c acpi
#
attach ipmi at mainbus
+# VMware Tools
+attach vmt at mainbus
+
# Dell Embedded Systems Management
device esm
attach esm at mainbus
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 42582e1f77f..a84966c5fc3 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.41 2008/06/18 20:15:54 mbalmer Exp $ */
+/* $OpenBSD: mainbus.c,v 1.42 2008/07/08 05:22:00 dlg Exp $ */
/* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */
/*
@@ -53,6 +53,7 @@
#include "acpi.h"
#include "ipmi.h"
#include "esm.h"
+#include "vmt.h"
#include "vesabios.h"
#include "amdmsr.h"
@@ -70,6 +71,10 @@
#include <dev/ipmivar.h>
#endif
+#if NVMT > 0
+#include <dev/vmtvar.h>
+#endif
+
#if NAMDMSR > 0
#include <machine/amdmsr.h>
#endif
@@ -160,6 +165,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 NMPBIOS > 0
if (mpbios_probe(self))
mpbios_scan(self);