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/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c
index 0b1ddf2559e54eea886a72c28eb976d6d4caebf7..17aab88816021900c1ede7a2fcbafa59f25f8398 100644 (file)
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -1789,35 +1789,6 @@ File_IsSameFile(ConstUnicode path1,  // IN:
    ASSERT(path1);
    ASSERT(path2);
 
-#if defined(VMX86_SERVER)
-   {
-      Unicode fs1;
-      Unicode fs2;
-
-      fs1 = Posix_RealPath(path1);
-      fs2 = Posix_RealPath(path2);
-
-      /*
-       * ESX doesn't have real inodes for VMFS disks in User Worlds. So only
-       * way to check if a file is the same is using real path. So said Satyam.
-       */
-
-      if (fs1 && Unicode_StartsWith(fs1, VCFS_MOUNT_POINT)) {
-         Bool res;
-
-         res = (!fs2 || Unicode_Compare(fs1, fs2) != 0) ? FALSE : TRUE;
-
-         Unicode_Free(fs1);
-         Unicode_Free(fs2);
-
-         return res;
-      }
-
-      Unicode_Free(fs1);
-      Unicode_Free(fs2);
-   }
-#endif
-
    /*
     * First take care of the easy checks.  If the paths are identical, or if
     * the inode numbers don't match, we're done.

diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c
index c9f532dca21d473e0d64745b984eb0a10382c132..900a339bc42c2454231c8634dfca95f34bf43f24 100644 (file)
--- a/open-vm-tools/lib/foundryMsg/foundryMsg.c
+++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c
@@ -242,7 +242,7 @@ static const VixCommandInfo vixCommandInfoTable[] = {
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_READ_VARIABLE,
                            VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_WRITE_VARIABLE,
-                           VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED),
+                           VIX_COMMAND_CATEGORY_MIXED),
    VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_CONNECT_DEVICE,

diff --git a/open-vm-tools/lib/ghIntegration/ghIntegration.c b/open-vm-tools/lib/ghIntegration/ghIntegration.c
index c77273d96b7571206f908fd0baff50e21d3ba11c..bb7ab680eb3ff36c438e27d1eb449547139d43bb 100644 (file)
--- a/open-vm-tools/lib/ghIntegration/ghIntegration.c
+++ b/open-vm-tools/lib/ghIntegration/ghIntegration.c
@@ -131,9 +131,9 @@ static Bool GHITcloSetFocusedWindow(RpcInData *data);
 static Bool GHITcloGetExecInfoHash(RpcInData *data);
 
 DynBuf gTcloUpdate;
-static GHIPlatform *ghiPlatformData;
 
-DblLnkLst_Links launchMenu;
+// The pointer to the platform-specific global state.
+static GHIPlatform *ghiPlatformData = NULL;
 
 /*
  *----------------------------------------------------------------------------
@@ -229,11 +229,16 @@ void
 GHI_Init(VMU_ControllerCB *vmuControllerCB, // IN
          void *ctx)                         // IN
 {
-   Debug("%s\n", __FUNCTION__);
-
-   DblLnkLst_Init(&launchMenu);
+   Debug("%s: Enter.\n", __FUNCTION__);
 
+   // Call the platform-specific initialization function.
    ghiPlatformData = GHIPlatformInit(vmuControllerCB, ctx);
+   if (!ghiPlatformData) {
+      // TODO: We should report this failure to the caller.
+      Debug("%s: GHIPlatformInit returned NULL pointer!\n", __FUNCTION__);
+   }
+
+   Debug("%s: Exit.\n", __FUNCTION__);
 }
 
 

diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index 9eb549f1c9ce85bd37e598c3c04eb4c2e12b4ac7..da58e8931bea433f8e6756a0c3c6b688fd6a1993 100644 (file)
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -2228,6 +2228,14 @@ typedef enum VixCommandSecurityCategory {
     * commands.
     */
    VIX_COMMAND_CATEGORY_PRIVILEGED,
+
+   /*
+    * A command that may or may not be privileged. Usually, extra inspection
+    * of the payload is required to make the determination. This should be
+    * used sparingly, since must always be accompanied by "deep packet
+    * inspection" code in the VMX (mainDispatch.c).
+    */
+   VIX_COMMAND_CATEGORY_MIXED,
 } VixCommandSecurityCategory;
 
 /*

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index caf368bbe385d02ac9950da82bc6a386adcd71b1..6f39d3f780a3c2b56545073b259ae61c996b4a6a 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -204,7 +204,7 @@
 #define PLAYER_VERSION "e.x.p"
 #define V2V_VERSION "e.x.p"
 #define V2V_FILE_VERSION 1,0,0,0
-#define FUSION_VERSION "3.0.1"
+#define FUSION_VERSION "3.0.2"
 
 // These must match VIE_FILEVERSION above
 #define SYSIMAGE_VERSION "4.0.0"

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h b/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h
index 2e29a94717fbca78cddf3452b1b1f23321ce1279..5ea437df72e62c5baa533a0f58ab45178f164272 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h
@@ -349,6 +349,8 @@ typedef struct VmxnetVMKShared {
    uint32  dontPostActions;  
 } VmxnetVMKShared;
 
+#if defined VMX86_VMX || defined VMKERNEL
+
 /*
  * Inline functions used to assist the implementation of the vmxnet interface.
  */
@@ -377,6 +379,7 @@ static INLINE void
 Vmxnet2_PutRx(Vmxnet2_RxRingEntry *rre, uint32 pktLength, uint16 ownership)
 {
    rre->actualLength = pktLength;
+   COMPILER_MEM_BARRIER();
    rre->ownership = ownership;
 }
 
@@ -426,5 +429,8 @@ Vmxnet2_GetRxEntry(Vmxnet2_RxRingInfo *ri, unsigned int idx)
 {
    return ri->base + idx;
 }
+
+#endif /* defined VMX86_VMX || defined VMKERNEL */
+
 #endif