From: VMware, Inc <>
Date: Mon, 15 Oct 2012 04:47:48 +0000 (-0700)
Subject: Internal branch sync. Included in this change:
X-Git-Tag: 2012.10.14-874563~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f78af6d9dfabc8b8316cfdc9975730f696c52b2;p=thirdparty%2Fopen-vm-tools.git

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 6c53de051..ded2262e0 100644
--- 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 15ef0aba6..c50d267cf 100644
--- 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 bbfb32e49..4ed9692ef 100644
--- 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 095a52445..73012298c 100644
--- 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 e97c7e9a9..e921b4e1d 100644
--- 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