Internal branch sync. Included in this change:

. Fix bug: guest background does not refresh after exit from unity mode.

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

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index 10f9a00b7a6a9d9ed5f28a296a711080641d4633..9f7b84790f9103682d7610a4792a7cc1ad585ca8 100644 (file)
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -237,9 +237,10 @@
    LOGLEVEL_VAR(sg), /* lib/sg */ \
    LOGLEVEL_VAR(ftcpt), \
    LOGLEVEL_VAR(wrapLib),  \
-   LOGLEVEL_VAR(bluetooth),  \
    LOGLEVEL_VAR(digestlib), \
+   LOGLEVEL_VAR(inputdevtap), \
    LOGLEVEL_VAR(svgadevtap), \
+   LOGLEVEL_VAR(masReceipt), \
    LOGLEVEL_VAR(ssl), \
    LOGLEVEL_VAR(vmrc), \
    /* end of list */

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index b2e8ec9a6a1dbfb87d3303f8aa5be09b743843ae..4c1333c8e74a05c035ed96360aa91488fd02c6ed 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -695,7 +695,7 @@ typedef void * UserVA;
  * that gcc will not do inlining.
  */
 
-#if defined(__GNUC__) && defined(VMM)
+#if defined(__GNUC__) && (defined(VMM) || defined (VMKERNEL))
 #define ABSOLUTELY_NOINLINE __attribute__((__noinline__))
 #endif
 

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 91b7eec066585d78caa51aaf468cc876841c0d3e..1b0ef0c82ec4a23e275db7d09d485d218050b9fd 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -427,8 +427,13 @@
  * run time, and the MUI is not really a separate product.
  */
 #   if defined(__APPLE__)
-#      define VMWARE_HOST_DIRECTORY_PREFIX \
-          "/Library/Application Support/" PRODUCT_SHORT_NAME
+#      if defined VMX86_DESKTOP
+#         define VMWARE_HOST_DIRECTORY_PREFIX \
+             "/Applications/" PRODUCT_SHORT_NAME ".app/Contents/Library"
+#      else
+#         define VMWARE_HOST_DIRECTORY_PREFIX \
+             "/Library/Application Support/" PRODUCT_SHORT_NAME
+#      endif
 #   endif
 
 #   if defined(VMX86_API)

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index 17da5b9eb028558dfc9fe5f752bf37439b7405ee..4ddf4108a18d9a3a381e9b086aa429385bf0a69b 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -243,6 +243,7 @@
 #define OVFTOOL_VERSION "2.1.0"
 #define VDM_CLIENT_VERSION "e.x.p"
 #define VGAUTH_VERSION "e.x.p"
+#define VIEWY_VERSION "e.x.p"
 
 
 // VMRC_PLUGIN_VERSION should match PLAYER_VERSION but can't be e.x.p
@@ -282,7 +283,7 @@
 
 #define USB_ARBITRATOR_VERSION_MAJOR 9
 #define USB_ARBITRATOR_VERSION_MINOR 0
-#define USB_ARBITRATOR_VERSION_Z     14
+#define USB_ARBITRATOR_VERSION_Z     19
 
 #define USB_ARBITRATOR_VERSION_BASE  USB_ARBITRATOR_VERSION_MAJOR.\
                                      USB_ARBITRATOR_VERSION_MINOR
@@ -298,7 +299,7 @@
  * USB Arbitrator Component version. This version is used by the linux
  * installer. See USB_ARBITRATOR_COMPONENT_VERSION_NUMBER in mk/defs-onetime.mk
  */
-#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.14"
+#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.19"
 
 #ifdef VMX86_VPX
 #define VIM_API_TYPE "VirtualCenter"

diff --git a/open-vm-tools/lib/misc/atomic.c b/open-vm-tools/lib/misc/atomic.c
index a115b69fc4aa5e466dfc4ca7780ef9a8ddbe9e4b..3d5b0ca063cbc4410d23a8249fa1ba2a3809ed88 100644 (file)
--- a/open-vm-tools/lib/misc/atomic.c
+++ b/open-vm-tools/lib/misc/atomic.c
@@ -30,9 +30,11 @@
 #include "x86cpuid.h"
 #include "x86cpuid_asm.h"
 #include "vm_basic_asm.h"
+#include "vmk_exports.h"
 
 
 Bool AtomicUseFence;
+VMK_KERNEL_EXPORT(AtomicUseFence);
 
 Bool atomicFenceInitialized;
 

diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/guestDnDMgr.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/guestDnDMgr.cc
index aec94b58b831a15aaa274f72f7bb9c6e0b7a99d5..5e98e6f5d608e141c0e0919ec45739114db7d127 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/guestDnDMgr.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/guestDnDMgr.cc
@@ -407,6 +407,11 @@ GuestDnDMgr::OnRpcUpdateUnityDetWnd(uint32 sessionId,
       return;
    }
 
+   if (mUnityDnDDetTimeout) {
+      g_source_destroy(mUnityDnDDetTimeout);
+      mUnityDnDDetTimeout = NULL;
+   }
+
    if (show) {
       /*
        * When showing full screen window, also show the small top-most
@@ -415,16 +420,13 @@ GuestDnDMgr::OnRpcUpdateUnityDetWnd(uint32 sessionId,
        * this window to accept drop in cancel case.
        */
       UpdateDetWnd(show, 1, 1);
-      if (mUnityDnDDetTimeout) {
-         g_source_unref(mUnityDnDDetTimeout);
-         mUnityDnDDetTimeout = NULL;
-      }
       mUnityDnDDetTimeout = g_timeout_source_new(UNITY_DND_DET_TIMEOUT);
       VMTOOLSAPP_ATTACH_SOURCE(mToolsAppCtx,
                                mUnityDnDDetTimeout,
                                DnDUnityDetTimeout,
                                this,
                                NULL);
+      g_source_unref(mUnityDnDDetTimeout);
       mSessionId = sessionId;
       Debug("%s: change sessionId to %d\n", __FUNCTION__, mSessionId);
    } else {