[src/trunk]: src/sys/arch/x86/x86 report guest type of "other" for i386 and "...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1057cd559470
branches:  trunk
changeset: 770483:1057cd559470
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Oct 18 21:41:25 2011 +0000

description:
report guest type of "other" for i386 and "other-64" for amd64

diffstat:

 sys/arch/x86/x86/vmt.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r dc5d22953eb3 -r 1057cd559470 sys/arch/x86/x86/vmt.c
--- a/sys/arch/x86/x86/vmt.c    Tue Oct 18 20:54:56 2011 +0000
+++ b/sys/arch/x86/x86/vmt.c    Tue Oct 18 21:41:25 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.4 2011/10/18 00:31:07 jmcneill Exp $ */
+/* $NetBSD: vmt.c,v 1.5 2011/10/18 21:41:25 jmcneill Exp $ */
 /* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
 
 /*
@@ -46,6 +46,13 @@
 
 /* #define VMT_DEBUG */
 
+/* OS name to report to host */
+#ifdef __i386__
+#define VM_OS_NAME     "other"
+#else
+#define VM_OS_NAME     "other-64"
+#endif
+
 /* "The" magic number, always occupies the EAX register. */
 #define VM_MAGIC                       0x564D5868
 
@@ -423,10 +430,10 @@
 
                /*
                 * host doesn't like it if we send an OS name it doesn't recognise,
-                * so use the closest match, which happens to be FreeBSD.
+                * so use "other" for i386 and "other-64" for amd64
                 */
                if (vm_rpc_send_rpci_tx(sc, "SetGuestInfo  %d %s",
-                   VM_GUEST_INFO_OS_NAME, "FreeBSD") != 0) {
+                   VM_GUEST_INFO_OS_NAME, VM_OS_NAME) != 0) {
                        device_printf(sc->sc_dev, "unable to set guest OS\n");
                        sc->sc_rpc_error = 1;
                }