s patch fixes some issues I've had when compiling Palacios 32-bit.

[palacios.git] / palacios / include / palacios / vmx_lowlevel.h

diff --git a/palacios/include/palacios/vmx_lowlevel.h b/palacios/include/palacios/vmx_lowlevel.h
index 6817ccc..01bca79 100644 (file)
--- a/palacios/include/palacios/vmx_lowlevel.h
+++ b/palacios/include/palacios/vmx_lowlevel.h
@@ -22,6 +22,7 @@
 
 #ifdef __V3VEE__
 
+#include <palacios/vmcs.h>
 
 #define VMX_SUCCESS         0 
 #define VMX_FAIL_INVALID    1
@@ -37,7 +38,7 @@
 
 /* Opcode definitions for all the VM instructions */
 
-#define VMCLEAR_OPCODE  ".byte 0x66,0xf,0x67;" /* reg=/6 */
+#define VMCLEAR_OPCODE  ".byte 0x66,0xf,0xc7;" /* reg=/6 */
 #define VMRESUME_OPCODE ".byte 0x0f,0x01,0xc3;"
 #define VMPTRLD_OPCODE  ".byte 0x0f,0xc7;" /* reg=/6 */
 #define VMPTRST_OPCODE  ".byte 0x0f,0xc7;" /* reg=/7 */
@@ -56,7 +57,7 @@
 
 
 
-static inline int v3_enable_vmx(struct vmcs_data * vmxon_ptr) {
+static inline int v3_enable_vmx(addr_t vmxon_ptr) {
     uint64_t vmxon_ptr_64 __attribute__((aligned(8))) = (uint64_t)vmxon_ptr;
     uint8_t ret_invalid = 0;
 
@@ -75,10 +76,8 @@ static inline int v3_enable_vmx(struct vmcs_data * vmxon_ptr) {
     }
 }
 
-// No vmcall necessary - is only executed by the guest
-
-static inline int vmcs_clear(struct vmcs_data* vmcs_ptr) {
-    uint64_t vmcs_ptr_64 = (uint64_t)vmcs_ptr;
+static inline int vmcs_clear(addr_t vmcs_ptr) {
+    uint64_t vmcs_ptr_64 __attribute__ ((aligned(8))) = (uint64_t)vmcs_ptr;
     uint8_t ret_valid = 0;
     uint8_t ret_invalid = 0;
 
@@ -96,26 +95,7 @@ static inline int vmcs_clear(struct vmcs_data* vmcs_ptr) {
     return VMX_SUCCESS;
 }
 
-
-static inline int vmcs_resume() {
-    uint8_t ret_valid = 0;
-    uint8_t ret_invalid = 0;
-
-    __asm__ __volatile__ (
-                VMRESUME_OPCODE
-                "seteb %0;"
-                "setnaeb %1;"
-                : "=q"(ret_valid), "=q"(ret_invalid)
-                : "0"(ret_valid), "1"(ret_invalid)
-                : "memory");
-
-    CHECK_VMXFAIL(ret_valid, ret_invalid);
-
-    return VMX_SUCCESS;
-}
-
-
-static inline int vmcs_load(struct vmcs_data* vmcs_ptr) {
+static inline int vmcs_load(addr_t vmcs_ptr) {
     uint64_t vmcs_ptr_64 = (uint64_t)vmcs_ptr;
     uint8_t ret_valid = 0;
     uint8_t ret_invalid = 0;
@@ -134,7 +114,7 @@ static inline int vmcs_load(struct vmcs_data* vmcs_ptr) {
     return VMX_SUCCESS;
 }
 
-static inline int vmcs_store(struct vmcs_data* vmcs_ptr) {
+static inline int vmcs_store(addr_t vmcs_ptr) {
     uint64_t vmcs_ptr_64 = (uint64_t)vmcs_ptr;
 
     __asm__ __volatile__ (
@@ -147,25 +127,24 @@ static inline int vmcs_store(struct vmcs_data* vmcs_ptr) {
     return VMX_SUCCESS;
 }
 
-static inline int vmcs_read(addr_t vmcs_index, void * dst, int len) {
-    uint64_t val = 0;
+static inline int vmcs_read(vmcs_field_t vmcs_field, void * dst) {
+    addr_t val = 0;
     uint8_t ret_valid = 0;
     uint8_t ret_invalid = 0;
 
     __asm__ __volatile__ (  
                 VMREAD_OPCODE
                 EAX_ECX_MODRM
-                "seteb %0;" // fail valid
+                "seteb %1;" // fail valid
                 "setnaeb %1;" // fail invalid
-                : "=q"(ret_valid), "=q"(ret_invalid), "=c"(val) // Use ECX
-                : "a" (vmcs_index), "0"(ret_valid), "1"(ret_invalid)
+                :  "=c"(val), "=d"(ret_valid) //, "=r"(ret_invalid) // Use ECX
+                : "a" (vmcs_field), "0"(0), "1"(ret_valid)
                 : "memory"
                 );
 
     CHECK_VMXFAIL(ret_valid, ret_invalid);
 
-    // TODO: Fix this, will have to do a cast because dst will be variable length
-    switch(len)
+    switch(v3_vmcs_get_field_len(vmcs_field))
     {
         case 2:
             *((uint16_t*)dst) = (uint16_t)val;
@@ -182,7 +161,7 @@ static inline int vmcs_read(addr_t vmcs_index, void * dst, int len) {
     return VMX_SUCCESS;
 }
 
-static inline int vmcs_write(addr_t vmcs_index, addr_t value) {
+static inline int vmcs_write(vmcs_field_t vmcs_field, addr_t value) {
     uint8_t ret_valid = 0;
     uint8_t ret_invalid = 0;
 
@@ -192,7 +171,7 @@ static inline int vmcs_write(addr_t vmcs_index, addr_t value) {
                 "seteb %0;" // fail valid (ZF=1)
                 "setnaeb %1;" // fail invalid (CF=1)
                 : "=q" (ret_valid), "=q" (ret_invalid)
-                : "a" (vmcs_index), "c"(value), "0"(ret_valid), "1"(ret_invalid)
+                : "a" (vmcs_field), "c"(value)
                 : "memory");
 
     CHECK_VMXFAIL(ret_valid, ret_invalid);