From ebf978230527071b156967e6b3298555122c31fa Mon Sep 17 00:00:00 2001
From: Michael Gebetsroither <michael.geb@gmx.at>
Date: Fri, 9 Mar 2007 19:52:36 +0100
Subject: [PATCH] few fixes

---
 compile/vmware-detect.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/compile/vmware-detect.c b/compile/vmware-detect.c
index 8ee1a7c..fad9b96 100644
--- a/compile/vmware-detect.c
+++ b/compile/vmware-detect.c
@@ -41,6 +41,7 @@ void printIdtr(const unsigned char* idtr, unsigned size)
     WRITE("\n");
 }
 
+// i386 {{{
 #if defined (__i386__)
 int checkVmware(const int debug)
 {
@@ -52,7 +53,7 @@ int checkVmware(const int debug)
 }
 int checkVmwareIO()
 {
-    unsigned int vmaj, vmin, magic, dout;
+    unsigned int vmaj, vmin, magic, dout = 11;
     __asm__ __volatile__(
             "mov $0x564D5868, %%eax; /* magic number */"
             "mov $0x3c6cf712, %%ebx; /* random number */"
@@ -64,8 +65,15 @@ int checkVmwareIO()
             "mov %%ecx, %2;"
             "mov %%edx, %3;"
         : "=r"(vmaj), "=r"(magic), "=r"(vmin), "=r"(dout));
+#ifdef DEBUG
+    fprintf(stderr, "version: major=%x, minor=%x, magic=%x, dout=%x\n",
+            vmaj, vmin, magic, dout);
+#endif
     return (0x564D5868 == magic) ? 1 : 0;
 }
+// }}}
+
+// x86-64 {{{
 #elif defined (__x86_64__)
 // only guessed, possible need to check against 0xffff?
 int checkVmware(const int debug)
@@ -77,11 +85,15 @@ int checkVmware(const int debug)
     return (0xff==idtr[9]) ? 1 : 0;
 }
 int checkVmwareIO() { return 0; }
+// }}}
+
+// others {{{
 #else
 // vmware runs only on the archs above
 int checkVmware(const int) { return 0; }
 int checkVmwareIO() { return 0; }
 #endif
+// }}}
 
 // returns 0 if running inside vmware, 1 otherwise
 int main(int argc, char* argv[]) {
@@ -95,9 +107,10 @@ int main(int argc, char* argv[]) {
     DWRITE("idt-check: ")
     if(!a) {
         DWRITE("false\n");
-        return 1;
-    }
-    DWRITE("true\n");
+        if(!debug)
+            return EXIT_FAILURE;
+    } else
+        DWRITE("true\n");
 
     // never returns if not running under vmware
     void dummy() { DWRITE("false\n"); exit(1); }
@@ -106,9 +119,10 @@ int main(int argc, char* argv[]) {
     b = checkVmwareIO();
     if(b) {
         DWRITE("true\n");
-        return 0;
+        return EXIT_SUCCESS;
     }
     // never reached
-    return 1;
+    WRITE("Error: IO check hasn't killed the program but no vmware found either!\n");
+    return EXIT_FAILURE;
 }
 // vim: foldmethod=marker
-- 
2.1.4