From: VMware, Inc <>
Date: Tue, 19 Oct 2010 19:48:12 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.10.18-313025~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4deb382860111e41a4af1200497bb491c8fef7fa;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/modules/linux/shared/vmci_iocontrols.h b/open-vm-tools/modules/linux/shared/vmci_iocontrols.h
index 028ce12f4..96989fc87 100644
--- a/open-vm-tools/modules/linux/shared/vmci_iocontrols.h
+++ b/open-vm-tools/modules/linux/shared/vmci_iocontrols.h
@@ -327,6 +327,7 @@ enum IOCTLCmd_VMCIMacOS {
 
 enum IOCTLCmd_VMCIWin32 {
    IOCTLCMD(DEVICE_GET) = IOCTLCMD(LAST2) + 1,
+   IOCTLCMD(SOCKETS_SERVICE_GET),
 };
 
 #define IOCTL_VMCI_VERSION VMCIIOCTL_BUFFERED(VERSION)
@@ -411,6 +412,8 @@ enum IOCTLCmd_VMCIWin32 {
                VMCIIOCTL_BUFFERED(SOCKETS_SET_SOCK_OPT)
 #define IOCTL_VMCI_SOCKETS_SHUTDOWN \
                VMCIIOCTL_BUFFERED(SOCKETS_SHUTDOWN)
+#define IOCTL_VMCI_SOCKETS_SERVICE_GET \
+               VMCIIOCTL_BUFFERED(SOCKETS_SERVICE_GET)
 /* END VMCI SOCKETS */
 
 #endif // _WIN32
@@ -632,12 +635,12 @@ typedef struct VMCIDeviceGetInfoVer2 {
    VMCIDoorbell_NotifyFct *doorbellNotify;
 } VMCIDeviceGetInfoVer2;
 
-/* Combination of all versions. */
 typedef struct VMCIDeviceGetInfoHdr {
    /* Requested API version on input, supported version on output. */
    uint32 apiVersion;
 } VMCIDeviceGetInfoHdr;
 
+/* Combination of all versions. */
 typedef struct VMCIDeviceGetInfo {
    VMCIDeviceGetInfoHdr hdr;
    VMCIDeviceGetInfoVer1 ver1;