X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmx_lowlevel.h;h=713875f36598566c677b935a57842a726cc2fb28;hb=2cb41f7db5b9f89113432d6b3daff4807ba8e5f2;hp=c169139b34f6dc96f570ca5d21c45d72b551023f;hpb=9b82fd29e9dc2b85339938098f77d8cf3487b099;p=palacios.git

diff --git a/palacios/include/palacios/vmx_lowlevel.h b/palacios/include/palacios/vmx_lowlevel.h
index c169139..713875f 100644
--- a/palacios/include/palacios/vmx_lowlevel.h
+++ b/palacios/include/palacios/vmx_lowlevel.h
@@ -97,7 +97,7 @@ static inline int vmcs_load(addr_t vmcs_ptr) {
     return VMX_SUCCESS;
 }
 
-static inline addr_t vmcs_store() {
+static inline uint64_t vmcs_store() {
     uint64_t vmcs_ptr = 0;
 
     __asm__ __volatile__ (
@@ -205,22 +205,22 @@ static inline int vmx_off() {
 static inline int enable_vmx() {
 #ifdef __V3_64BIT__
     __asm__ __volatile__ (
-			  "movq %%cr4, %%rbx;"
-			  "orq  $0x00002000, %%rbx;"
-			  "movq %%rbx, %%cr4;"
+			  "movq %%cr4, %%rcx;"
+			  "orq  $0x00002000, %%rcx;"
+			  "movq %%rcx, %%cr4;"
 			  : 
 			  :
-			  : "%rbx"
+			  : "%rcx"
 			  );
 
 
     __asm__ __volatile__ (
-			  "movq %%cr0, %%rbx; "
-			  "orq  $0x00000020,%%rbx; "
-			  "movq %%rbx, %%cr0;"
+			  "movq %%cr0, %%rcx; "
+			  "orq  $0x00000020,%%rcx; "
+			  "movq %%rcx, %%cr0;"
 			  :
 			  :
-			  : "%rbx"
+			  : "%rcx"
 			  );
 #elif __V3_32BIT__
     __asm__ __volatile__ (