From: VMware, Inc <>
Date: Tue, 17 Nov 2009 21:29:06 +0000 (-0800)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2009.11.16-210370~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f324c9c52c6b6e7ffa9a3d1fee52db34e33f08c5;p=thirdparty%2Fopen-vm-tools.git

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/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index ce7200f87..2019882e3 100644
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -95,6 +95,7 @@ enum {
    VIX_REQUESTMSG_RUN_IN_ANY_VMX_STATE                = 0x04,
    VIX_REQUESTMSG_REQUIRES_INTERACTIVE_ENVIRONMENT    = 0x08,
    VIX_REQUESTMSG_INCLUDES_AUTH_DATA_V1               = 0x10,
+   VIX_REQUESTMSG_REQUIRES_VMDB_NOTIFICATION          = 0x20,
 };
 
 
@@ -102,10 +103,11 @@ enum {
  * These are the flags set in responseFlags.
  */
 enum VixResponseFlagsValues {
-   VIX_RESPONSE_SOFT_POWER_OP       = 0x0001,
-   VIX_RESPONSE_EXTENDED_RESULT_V1  = 0x0002,
-   VIX_RESPONSE_TRUNCATED           = 0x0004,
-   VIX_RESPONSE_FSR                 = 0x0008
+   VIX_RESPONSE_SOFT_POWER_OP             = 0x0001,
+   VIX_RESPONSE_EXTENDED_RESULT_V1        = 0x0002,
+   VIX_RESPONSE_TRUNCATED                 = 0x0004,
+   VIX_RESPONSE_FSR                       = 0x0008,
+   VIX_RESPONSE_VMDB_NOTIFICATION_POSTED  = 0x0010,
 };
 
 
diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index de7c2dfa5..ed1b492b4 100644
--- 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.5"
+#define VIM_API_VERSION "4.1"
 #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 199915148..35b268fc3 100644
--- a/open-vm-tools/modules/linux/pvscsi/scsi_defs.h
+++ b/open-vm-tools/modules/linux/pvscsi/scsi_defs.h
@@ -1269,10 +1269,11 @@ struct {
        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
+   uint32     lbn; // block number to begin sync
    uint8       :4,
       grp_num  :4;
-   uint8      lbc; // blk to begin sync, 0 for full disk
+   uint16     lbc; // number of blocks to sync, 0 for all blocks starting
+                   // from lbn to the last block on the medium
    uint8  control; // control byte
 }
 #include "vmware_pack_end.h"
@@ -1286,10 +1287,11 @@ struct {
        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
+   uint64     lbn; // block number to begin sync
+   uint32     lbc; // number of blocks to sync, 0 for all blocks starting
+                   // from lbn to the last block on the medium
    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"
diff --git a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
index 07fbbb6f6..6c6a3d71d 100644
--- a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
@@ -76,4 +76,5 @@
 #define VMNET_CAP_TSO6         0x100000	/* Can do TSO segmentation offload for IPv6 pkts. */
 #define VMNET_CAP_TSO256k      0x200000	/* Can do TSO segmentation offload for pkts up to 256kB. */
 #define VMNET_CAP_UPT          0x400000	/* Support UPT */
+#define VMNET_CAP_RDONLY_INETHDRS 0x800000 /* Modifies inet headers for TSO/CSUm */
 #endif // _VMNET_DEF_H_