From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:39 +0000 (-0700)
Subject: Rename VThread_IsXxx() to VMX_IsXxxThread()
X-Git-Tag: stable-10.2.0~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f01a8f551cfd6c82ae2d851d51dcf4173493e674;p=thirdparty%2Fopen-vm-tools.git

Rename VThread_IsXxx() to VMX_IsXxxThread()

Unrelated to open-vm-tools.
---

diff --git a/open-vm-tools/lib/poll/poll.c b/open-vm-tools/lib/poll/poll.c
index a0d89cd52..f1c0184bf 100644
--- a/open-vm-tools/lib/poll/poll.c
+++ b/open-vm-tools/lib/poll/poll.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -1262,7 +1262,6 @@ PollUnitTest_StateMachine(void *clientData) // IN: Unused
 #else
    maxVMCISockets = 60;
 #endif
-   isVMX = VThread_CurID() == VTHREAD_VMX_ID;
    queueLen = isVMX ? MAX_VMX_QUEUE_LENGTH : MAX_QUEUE_LENGTH;
 
    switch (state) {
@@ -2188,7 +2187,7 @@ PollUnitTest_StateMachine(void *clientData) // IN: Unused
  */
 
 void
-PollUnitTest(void)
+PollUnitTest(Bool vmx)  // IN: use vmx-size poll queue
 {
 #ifdef _WIN32
    WSADATA wsaData;
@@ -2200,6 +2199,7 @@ PollUnitTest(void)
    state = 0;
    successCount = failureCount = 0;
    useLocking = FALSE;
+   isVMX = vmx;
 #ifdef _WIN32
    ret = WSAStartup(versionRequested, &wsaData);
    if (ret != 0) {