Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 6a1f91ee0d82ba6d9d5517457f2fc890021137c1..8e1614a8c309cd67d0ee35e6bc59adf382647661 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -389,7 +389,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_EIGHT               "windows8"
 #define STR_OS_WIN_EIGHT_X64           "windows8-64"
 #define STR_OS_WIN_EIGHT_GENERIC       "Windows 8"
-#define STR_OS_WIN_EIGHTSERVER_GENERIC "Windows 8 Server"
+#define STR_OS_WIN_EIGHTSERVER_GENERIC "Windows Server 2012"
 
 /*
  * XXX - These need to be updated when MS announces official Win 8 names.

diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index 3e345133551093efa1c18b5452c8ab894554334c..fc7552c6c131e2226204803192f12f5add3d408b 100644 (file)
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -137,6 +137,7 @@
    LOGLEVEL_VAR(mksGLState), \
    LOGLEVEL_VAR(mksGLWindow), \
    LOGLEVEL_VAR(mksGLContextMux), \
+   LOGLEVEL_VAR(mksGLDraw), \
    LOGLEVEL_VAR(mksWinBSOD), \
    LOGLEVEL_VAR(vdpPlugin), \
    \

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index 12bcb676d526df22f8fad318e254de65bb8bb7ac..e0a691f57789df1418e4bf9fb8112d9d3dbd261b 100644 (file)
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2004 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2013 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -114,6 +114,8 @@ extern "C" {
            Panic(_##name##Fmt "\n", __FILE__, __LINE__)
 #define _ASSERT_PANIC_BUG(bug, name) \
            Panic(_##name##Fmt " bugNr=%d\n", __FILE__, __LINE__, bug)
+#define _ASSERT_PANIC_NORETURN(name) \
+           Panic(_##name##Fmt "\n", __FILE__, __LINE__)
 #endif /* VMKERNEL */
 
 #ifdef VMX86_DEVEL
@@ -216,12 +218,18 @@ EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
 #define ASSERT_NOT_IMPLEMENTED_BUG(bug, cond) \
            ASSERT_IFNOT(cond, NOT_IMPLEMENTED_BUG(bug))
 
+#if defined VMM
+#define NOT_IMPLEMENTED()        _ASSERT_PANIC_NORETURN(AssertNotImplemented)
+#define NOT_IMPLEMENTED_BUG(bug) \
+          _ASSERT_PANIC_BUG_NORETURN(bug, AssertNotImplemented)
+#else
 #if defined VMKERNEL && defined VMX86_DEBUG
 #define NOT_IMPLEMENTED()        _ASSERT_PANIC_NORETURN(AssertNotImplemented)
 #else
 #define NOT_IMPLEMENTED()        _ASSERT_PANIC(AssertNotImplemented)
 #endif
 #define NOT_IMPLEMENTED_BUG(bug) _ASSERT_PANIC_BUG(bug, AssertNotImplemented)
+#endif
 
 #if defined VMKERNEL && defined VMX86_DEBUG
 #define NOT_REACHED()            _ASSERT_PANIC_NORETURN(AssertNotReached)