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/backdoor_def.h b/open-vm-tools/lib/include/backdoor_def.h
index 739fe4ed5a7aed2b6e96b8bc38b58fa322b627a6..e83e0f59c4f9e10c85e4458ff141421cd1d7d0ed 100644 (file)
--- a/open-vm-tools/lib/include/backdoor_def.h
+++ b/open-vm-tools/lib/include/backdoor_def.h
@@ -93,7 +93,7 @@
 #define BDOOR_CMD_GETUUID               19
 #define BDOOR_CMD_GETMEMSIZE            20
 #define BDOOR_CMD_HOSTCOPY              21 /* Devel only */
-#define BDOOR_CMD_SERVICE_VM            22 /* prototype only */         
+#define BDOOR_CMD_SERVICE_VM            22 /* Unused, never shipped, prototype only */         
 #define BDOOR_CMD_GETTIME               23 /* Deprecated. Use GETTIMEFULL. */
 #define BDOOR_CMD_STOPCATCHUP           24
 #define BDOOR_CMD_PUTCHR               25 /* Devel only */

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 00921dbf5eaa09d7f29420dda122a2951e839858..640dd38e2217735e4600fc28664ebae482f1a8c1 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -87,10 +87,11 @@
 
 #if defined _WIN32 && defined USERLEVEL
    #include <stddef.h>  /*
-                         * We re-define offsetof macro from stddef, make 
-                         * sure that its already defined before we do it
+                         * We redefine offsetof macro from stddef; make 
+                         * sure that it's already defined before we do that.
                          */
    #include <windows.h>        // for Sleep() and LOWORD() etc.
+   #undef GetFreeSpace  // Unpollute preprocessor namespace.
 #endif
 
 

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index 742caea086c934cb375c79646d44375f67ba2e21..de7c2dfa51845608cf2d461c315ed5307a1f1897 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -221,7 +221,7 @@
 #define VMLS_VERSION "e.x.p"
 #define VLICENSE_VERSION "1.1.2"
 #define DDK_VERSION "e.x.p"
-#define VIM_API_VERSION "4.0"
+#define VIM_API_VERSION "4.5"
 #define VIPERL_VERSION "1.1.0"
 #define RCLI_VERSION "4.5.0"
 #define VDM_VERSION "e.x.p"

diff --git a/open-vm-tools/modules/linux/pvscsi/scsi_defs.h b/open-vm-tools/modules/linux/pvscsi/scsi_defs.h
index 217acebbad79d24539e2c3b0d14b4422ac5e9bb2..290b3d1f889de1b8e478ef217512e72d41acb588 100644 (file)
--- a/open-vm-tools/modules/linux/pvscsi/scsi_defs.h
+++ b/open-vm-tools/modules/linux/pvscsi/scsi_defs.h
@@ -786,6 +786,43 @@ typedef struct {
          wp       :1;   // write protected
 } SCSIBlockModeSenseDeviceParameter;
 
+/*
+ * Structure for Mode Caching Page.
+ */
+typedef
+#include "vmware_pack_begin.h"
+struct {
+   uint8   pageCode:6,
+           reserved1:1,
+           ps:1;
+   uint8   pageLength;
+   uint8   rcd:1,
+           mf:1,
+           wce:1,   // set if device has a write cache and it is enabled
+           size:1,
+           disc:1,
+           cap:1,
+           abpf:1,
+           ic:1;
+   uint8   writePriority:4,
+           readPriority:4;
+   uint16  disablePrefetchTransferLength;
+   uint16  minPrefetch;
+   uint16  maxPrefetch;
+   uint16  maxPrefetchCeiling;
+   uint8   reserved2:3,
+           vs:2,
+           dra:1,
+           lbcss:1,
+           fsw:1;
+   uint8 numCacheSegments;
+   uint16 cacheSegmentSize;
+   uint8 reserved3;
+   uint8 nonCacheSegmentSize[3];
+} 
+#include "vmware_pack_end.h"
+SCSIModeSenseCachePage;
+
 /*
  * Command structure for a SCSI Reserve command.
  */
@@ -1202,6 +1239,43 @@ struct {
 #include "vmware_pack_end.h"
 SCSIReadCapacity16Response;
 
+/*
+ * Format of SYNCHRONIZE CACHE (10) and (16) request and response blocks.
+ */
+typedef
+#include "vmware_pack_begin.h"
+struct {
+   uint8 opcode;  // 0x35
+   uint8       :5,
+       sync_nv :1,
+       immed   :1, // if set return without waiting for sync to complete
+               :1;
+   uint32     lbn; // number of blocks to sync, 0 for full disk
+   uint8       :4,
+      grp_num  :4;
+   uint8      lbc; // blk to begin sync, 0 for full disk
+   uint8  control; // control byte
+}
+#include "vmware_pack_end.h"
+SCSISyncCache10Cmd;
+
+typedef
+#include "vmware_pack_begin.h"
+struct {
+   uint8 opcode;  // 0x91
+   uint8       :5,
+       sync_nv :1,
+       immed   :1, // if set return, wihout waiting for sync to complete
+               :1;
+   uint64     lbn; // number of blocks to sync, 0 for full disk
+   uint8       :4,
+      grp_num  :4;
+   uint32     lbc; // block number to begin sync, 0 for full disk
+   uint8  control; // control byte
+}
+#include "vmware_pack_end.h"
+SCSISyncCache16Cmd;
+
 /*
  * Format of READ/WRITE (6), (10), (12) and (16)
  * request. These are defined here because multiple SCSI

diff --git a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c
index e227f38e86a724c6f2441acb04b13edd00abebe2..e7ed33b5d3da37f467464425a9d191556268b77a 100644 (file)
--- a/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c
+++ b/open-vm-tools/modules/linux/vmxnet3/vmxnet3_drv.c
@@ -156,7 +156,7 @@ static int enable_shm[VMXNET3_SHM_MAX_DEVICES + 1] =
    { [0 ... VMXNET3_SHM_MAX_DEVICES] = -1 };
 static char *shm_disclaimer = NULL;
 static int correct_shm_disclaimer;
-#define VMXNET3_SHM_DISCLAIMER "IReallyWantThisModeIAmAVMSafePartner"
+#define VMXNET3_SHM_DISCLAIMER "IReallyWantThisModeIAmAVMwarePartner"
 
 /*
  *----------------------------------------------------------------------------