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 bd2f907ea71d77634bf29c29e34f905bbab0fe1c..71c805e821e2d240d2457f289b6c148e051ce16e 100644 (file)
--- 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_