From: VMware, Inc <>
Date: Wed, 24 Feb 2010 22:11:12 +0000 (-0800)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.02.23-236320~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d2b8ec50fb5dee419d386394025d6696c590a96;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/vcpuid.h b/open-vm-tools/lib/include/vcpuid.h
index bd2f907ea..71c805e82 100644
--- a/open-vm-tools/lib/include/vcpuid.h
+++ b/open-vm-tools/lib/include/vcpuid.h
@@ -43,11 +43,16 @@ typedef uint32 Vcpuid;			// VCPU number
 
 #define VCPUID_INVALID	(~0U)
 
-#define BOOT_VCPU_ID		0
+#define BOOT_VCPU_ID     0
 #define IS_BOOT_VCPUID(vcpuid)  ((vcpuid) == BOOT_VCPU_ID)
 #define IS_BOOT_VCPU()		IS_BOOT_VCPUID(CurVcpuid())
 
 #define MAX_VCPUS	32
 
+#ifdef VMM
+/* In VMM, CurVcpuid() is available everywhere. */
+extern const Vcpuid curVcpuid;
+#define CurVcpuid()             (curVcpuid)
+#endif
 
 #endif // ifndef _VCPUID_H_