Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

diff --git a/palacios/include/palacios/vmx_lowlevel.h b/palacios/include/palacios/vmx_lowlevel.h
index 01bca79..6db9f17 100644 (file)
--- a/palacios/include/palacios/vmx_lowlevel.h
+++ b/palacios/include/palacios/vmx_lowlevel.h
@@ -155,6 +155,8 @@ static inline int vmcs_read(vmcs_field_t vmcs_field, void * dst) {
         case 8:
             *((uint64_t*)dst) = (uint64_t)val;
             break;
+       default:
+            return -1;
     }
 
 

diff --git a/palacios/src/palacios/vmcs.c b/palacios/src/palacios/vmcs.c
index 154bed8..0b874fd 100644 (file)
--- a/palacios/src/palacios/vmcs.c
+++ b/palacios/src/palacios/vmcs.c
@@ -851,6 +851,7 @@ int v3_vmcs_get_field_len(vmcs_field_t field) {
         case VMCS_GUEST_DBG_CTL_HIGH:
         case VMCS_GUEST_PERF_GLOBAL_CTRL_HIGH:
        case VMCS_HOST_PERF_GLOBAL_CTRL_HIGH:
+       case VMCS_GUEST_EFER_HIGH:
             return 4;
 
             /* Natural Width Control Fields */
@@ -914,10 +915,11 @@ int v3_vmcs_get_field_len(vmcs_field_t field) {
         case VMCS_HOST_SYSENTER_EIP:
         case VMCS_HOST_RSP:
         case VMCS_HOST_RIP:
+       case VMCS_GUEST_EFER:
             return sizeof(addr_t);
 
         default:
-           PrintError("Invalid VMCS field\n");
+           PrintError("Invalid VMCS field: 0x%x\n", field);
             return -1;
     }
 }

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index a773191..80f3350 100644 (file)
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -770,7 +770,7 @@ int v3_vmx_enter(struct guest_info * info) {
 #endif
 
     // Handle any exits needed still in the atomic section
-    if (v3_handle_vmx_exit(info, &exit_info) == -1) {
+    if (v3_handle_atomic_vmx_exit(info, &exit_info) == -1) {
        PrintError("Error in atomic VMX exit handler\n");
        return -1;
     }

diff --git a/palacios/src/palacios/vmx_ctrl_regs.c b/palacios/src/palacios/vmx_ctrl_regs.c
index afa0fb8..685de90 100644 (file)
--- a/palacios/src/palacios/vmx_ctrl_regs.c
+++ b/palacios/src/palacios/vmx_ctrl_regs.c
@@ -161,7 +161,7 @@ static int handle_mov_to_cr0(struct guest_info * info, v3_reg_t * new_cr0, struc
             return -1;
         }
        
-        if (vmx_info->state == VMXASSIST_ENABLED) {
+        if (vmx_info->assist_state == VMXASSIST_ENABLED) {
             PrintDebug("Loading VMXASSIST at RIP: %p\n", (void *)(addr_t)info->rip);
         } else {
             PrintDebug("Leaving VMXASSIST and entering protected mode at RIP: %p\n",