X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_lowlevel.h;h=71af1051247b400ae923ac43cc9d9c63c92a165f;hb=1aca7149486edc3fc72bb0dcf39b18fb12eb23a8;hp=6558884603154e11ab506fb30a09d21dda6f5712;hpb=1316eb77b6d89245583446dab3345f749c415764;p=palacios.git

diff --git a/palacios/include/palacios/vmm_lowlevel.h b/palacios/include/palacios/vmm_lowlevel.h
index 6558884..71af105 100644
--- a/palacios/include/palacios/vmm_lowlevel.h
+++ b/palacios/include/palacios/vmm_lowlevel.h
@@ -20,7 +20,7 @@
 #include <palacios/vmm_types.h>
 
 
-#define CPUID_FEATURE_IDS 0x80000001
+#define CPUID_FEATURE_IDS 0x00000001
 #define CPUID_EXT_FEATURE_IDS 0x80000001
 
 
@@ -28,12 +28,9 @@
 
 static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
     __asm__ __volatile__ (
-			  "pushl %%ebx\n\t"
 			  "cpuid\n\t"
-			  "movl %%ebx, %%esi\n\t"
-			  "popl %%ebx\n\t"
 			  : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx)
-			  : "a" (target)
+			  : "0" (target), "2" (*ecx)
 			  );
     return;
 }
@@ -42,12 +39,9 @@ static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_
 
 static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
     __asm__ __volatile__ (
-			  "pushq %%rbx\n\t"
 			  "cpuid\n\t"
-			  "movq %%rbx, %%rsi\n\t"
-			  "popq %%rbx\n\t"
-			  : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx)
-			  : "a" (target)
+			  : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+			  : "0" (target), "2" (*ecx)
 			  );
     return;
 }