Internal branch sync. Included in this change:

. removed SEQPACKET support from VMCI driver as we are not going to ship
  in in its current form.

. 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/util_shared.h b/open-vm-tools/lib/include/util_shared.h
index 6c53de051b74d53414b47c85374b13c56c9a942e..ded2262e025bdc99683a4162af6e49c5a7932f6a 100644 (file)
--- a/open-vm-tools/lib/include/util_shared.h
+++ b/open-vm-tools/lib/include/util_shared.h
@@ -22,6 +22,9 @@
 #define INCLUDE_ALLOW_VMKERNEL
 #include "includeCheck.h"
 
+#include "vm_assert.h"
+#include "vm_basic_types.h"
+
 /*
  * Defines util functions shared between the userlevel code and the monitor.
  */

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

diff --git a/open-vm-tools/lib/include/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h
index bbfb32e491d2915e12ba0599c687578085d59e42..4ed9692efae34eefd20e41e6ceb819e9357fe9ad 100644 (file)
--- a/open-vm-tools/lib/include/vmci_defs.h
+++ b/open-vm-tools/lib/include/vmci_defs.h
@@ -860,8 +860,7 @@ VMCIQueueHeader_BufReady(const VMCIQueueHeader *consumeQHeader, // IN:
 #define VMCI_FP_DOORBELL     (VMCI_FP_QUEUEPAIR + 1)
 #define VMCI_FP_DATAGRAM     (VMCI_FP_DOORBELL + 1)
 #define VMCI_FP_STREAMSOCK   (VMCI_FP_DATAGRAM + 1)
-#define VMCI_FP_SEQPACKET    (VMCI_FP_STREAMSOCK + 1)
-#define VMCI_FP_MAX          (VMCI_FP_SEQPACKET + 1)
+#define VMCI_FP_MAX          (VMCI_FP_STREAMSOCK + 1)
 
 #define VMCI_FD_INVALID  -1
 #define VMCI_FD_GUEST     0

diff --git a/open-vm-tools/lib/include/xdrutil.h b/open-vm-tools/lib/include/xdrutil.h
index 095a524459bb7896da6dceb98e30bed1893b2e20..73012298ce8bd5f792add2598807f8e227be286c 100644 (file)
--- a/open-vm-tools/lib/include/xdrutil.h
+++ b/open-vm-tools/lib/include/xdrutil.h
@@ -50,8 +50,9 @@
  *
  * 'f' should be a string with the field name.
  */
+#define XDRUTIL_COUNT(ptr, field) ((ptr)->field.field##_len)
 #define XDRUTIL_FOREACH(counter, ptr, field)                               \
-   for ((counter) = 0; (counter) < (ptr)->field.field##_len; (counter)++)
+   for ((counter) = 0; (counter) < XDRUTIL_COUNT(ptr, field); (counter)++)
 
 #define XDRUTIL_GETITEM(ptr, field, idx) &((ptr)->field.field##_val[idx])
 

diff --git a/open-vm-tools/modules/linux/shared/vmci_defs.h b/open-vm-tools/modules/linux/shared/vmci_defs.h
index e97c7e9a9a23d9f6ce3636d40bb179137f9c76a7..e921b4e1d5dd4dab89b5f56a6d4ad085c0348b78 100644 (file)
--- a/open-vm-tools/modules/linux/shared/vmci_defs.h
+++ b/open-vm-tools/modules/linux/shared/vmci_defs.h
@@ -860,8 +860,7 @@ VMCIQueueHeader_BufReady(const VMCIQueueHeader *consumeQHeader, // IN:
 #define VMCI_FP_DOORBELL     (VMCI_FP_QUEUEPAIR + 1)
 #define VMCI_FP_DATAGRAM     (VMCI_FP_DOORBELL + 1)
 #define VMCI_FP_STREAMSOCK   (VMCI_FP_DATAGRAM + 1)
-#define VMCI_FP_SEQPACKET    (VMCI_FP_STREAMSOCK + 1)
-#define VMCI_FP_MAX          (VMCI_FP_SEQPACKET + 1)
+#define VMCI_FP_MAX          (VMCI_FP_STREAMSOCK + 1)
 
 #define VMCI_FD_INVALID  -1
 #define VMCI_FD_GUEST     0