Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Succesfully launches and jumps into the exit handler. Need to write a proper exit...
[palacios.git] / palacios / src / palacios / vmx.c
index 6c2939d..93b3c16 100644 (file)
 #include <palacios/vmm_lowlevel.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vmm_ctrl_regs.h>
+#include <palacios/vm_guest_mem.h>
 
+static addr_t vmxon_ptr_phys;
+extern int v3_vmx_exit_handler();
+extern int v3_vmx_vmlaunch(struct v3_gprs * vm_regs);
 
-// 
-// 
-// CRUFT
-//
-//
-
-#if 0
-
-#include <palacios/vmm_util.h>
-#include <palacios/vmm_string.h>
-#include <palacios/vmm_ctrl_regs.h>
-
-
-
-extern int Launch_VM(ullong_t vmcsPtr, uint_t eip);
-
-#define NUMPORTS 65536
-
-
-#define VMXASSIST_INFO_PORT   0x0e9
-#define ROMBIOS_PANIC_PORT    0x400
-#define ROMBIOS_PANIC_PORT2   0x401
-#define ROMBIOS_INFO_PORT     0x402
-#define ROMBIOS_DEBUG_PORT    0x403
-
-
-
-static uint_t GetLinearIP(struct VM * vm) {
-  if (vm->state == VM_VMXASSIST_V8086_BIOS || vm->state == VM_VMXASSIST_V8086) { 
-    return vm->vmcs.guestStateArea.cs.baseAddr + vm->vmcs.guestStateArea.rip;
-  } else {
-    return vm->vmcs.guestStateArea.rip;
-  }
-}
-
-
-
-
-#define MAX_CODE 512
-#define INSTR_OFFSET_START 17
-#define NOP_SEQ_LEN        10
-#define INSTR_OFFSET_END   (INSTR_OFFSET_START + NOP_SEQ_LEN - 1)
-#define TEMPLATE_CODE_LEN  35
-
-uint_t oldesp = 0;
-uint_t myregs = 0;
-
-
-
-
-
-extern uint_t VMCS_LAUNCH();
-extern uint_t Init_VMCS_HostState();
-extern uint_t Init_VMCS_GuestState();
-
-
-
-
-extern int Get_CR2();
-extern int vmRunning;
-
-
-
-
-
-void DecodeCurrentInstruction(struct VM *vm, struct Instruction *inst)
-{
-  // this is a gruesome hack
-  uint_t address = GetLinearIP(vm);
-  uint_t length = vm->vmcs.exitInfoFields.instrLength;
-  unsigned char *t = (unsigned char *) address;
-
-
-  
-  PrintTrace("DecodeCurrentInstruction: instruction is\n");
-  PrintTraceMemDump(t,length);
-  
-  if (length==3 && t[0]==0x0f && t[1]==0x22 && t[2]==0xc0) { 
-    // mov from eax to cr0
-    // usually used to signal
-    inst->type=VM_MOV_TO_CR0;
-    inst->address=address;
-    inst->size=length;
-    inst->input1=vm->registers.eax;
-    inst->input2=vm->vmcs.guestStateArea.cr0;
-    inst->output=vm->registers.eax;
-    PrintTrace("MOV FROM EAX TO CR0\n");
-  } else {
-    inst->type=VM_UNKNOWN_INST;
-  }
-}
-
-
-
-static void ConfigureExits(struct VM *vm)
-{
-  CopyOutVMCSExecCtrlFields(&(vm->vmcs.execCtrlFields));
-
-  vm->vmcs.execCtrlFields.pinCtrls |= 0 
-    // EXTERNAL_INTERRUPT_EXITING 
-    | NMI_EXITING;
-  vm->vmcs.execCtrlFields.procCtrls |= 0
-      // INTERRUPT_WINDOWS_EXIT 
-      | USE_TSC_OFFSETTING
-      | HLT_EXITING  
-      | INVLPG_EXITING           
-      | MWAIT_EXITING            
-      | RDPMC_EXITING           
-      | RDTSC_EXITING         
-      | MOVDR_EXITING         
-      | UNCONDITION_IO_EXITING
-      | MONITOR_EXITING       
-      | PAUSE_EXITING         ;
-
-  CopyInVMCSExecCtrlFields(&(vm->vmcs.execCtrlFields));
-  
-  CopyOutVMCSExitCtrlFields(&(vm->vmcs.exitCtrlFields));
-
-  vm->vmcs.exitCtrlFields.exitCtrls |= ACK_IRQ_ON_EXIT;
-  
-  CopyInVMCSExitCtrlFields(&(vm->vmcs.exitCtrlFields));
-
-
-/*   VMCS_READ(VM_EXIT_CTRLS, &flags); */
-/*   flags |= ACK_IRQ_ON_EXIT; */
-/*   VMCS_WRITE(VM_EXIT_CTRLS, &flags); */
-}
-
-
-extern int RunVMM();
-extern int SAFE_VM_LAUNCH();
-
-int MyLaunch(struct VM *vm)
+static int inline check_vmcs_write(vmcs_field_t field, addr_t val)
 {
-  ullong_t vmcs = (ullong_t)((uint_t) (vm->vmcsregion));
-  uint_t entry_eip = vm->descriptor.entry_ip;
-  uint_t exit_eip = vm->descriptor.exit_eip;
-  uint_t guest_esp = vm->descriptor.guest_esp;
-  uint_t f = 0xffffffff;
-  uint_t tmpReg = 0;
-  int ret;
-  int vmm_ret = 0;
-
-  PrintTrace("Guest ESP: 0x%x (%u)\n", guest_esp, guest_esp);
-
-  exit_eip = (uint_t)RunVMM;
-
-  PrintTrace("Clear\n");
-  VMCS_CLEAR(vmcs);
-  PrintTrace("Load\n");
-  VMCS_LOAD(vmcs);
-
-
-  PrintTrace("VMCS_LINK_PTR\n");
-  VMCS_WRITE(VMCS_LINK_PTR, &f);
-  PrintTrace("VMCS_LINK_PTR_HIGH\n");
-  VMCS_WRITE(VMCS_LINK_PTR_HIGH, &f);
-
-  SetCtrlBitsCorrectly(IA32_VMX_PINBASED_CTLS_MSR, PIN_VM_EXEC_CTRLS);
-  SetCtrlBitsCorrectly(IA32_VMX_PROCBASED_CTLS_MSR, PROC_VM_EXEC_CTRLS);
-  SetCtrlBitsCorrectly(IA32_VMX_EXIT_CTLS_MSR, VM_EXIT_CTRLS);
-  SetCtrlBitsCorrectly(IA32_VMX_ENTRY_CTLS_MSR, VM_ENTRY_CTRLS);
-
-  //
-  //
-  //SetCtrlBitsCorrectly(IA32_something,GUEST_IA32_DEBUGCTL);
-  //SetCtrlBitsCorrectly(IA32_something,GUEST_IA32_DEBUGCTL_HIGH);
-
-
-  /* Host state */
-  PrintTrace("Setting up host state\n");
-  SetCRBitsCorrectly(IA32_VMX_CR0_FIXED0_MSR, IA32_VMX_CR0_FIXED1_MSR, HOST_CR0);
-  SetCRBitsCorrectly(IA32_VMX_CR4_FIXED0_MSR, IA32_VMX_CR4_FIXED1_MSR, HOST_CR4);
-  ret = Init_VMCS_HostState();
-
-  if (ret != VMX_SUCCESS) {
-    if (ret == VMX_FAIL_VALID) {
-      PrintTrace("Init Host state: VMCS FAILED WITH ERROR\n");
-    } else {
-      PrintTrace("Init Host state: Invalid VMCS\n");
-    }
-    return ret;
-  }
-
-  //  PrintTrace("HOST_RIP: %x (%u)\n", exit_eip, exit_eip);
-  VMCS_WRITE(HOST_RIP, &exit_eip);
-
-  /* Guest state */
-  PrintTrace("Setting up guest state\n");
-  PrintTrace("GUEST_RIP: %x (%u)\n", entry_eip, entry_eip);
-  VMCS_WRITE(GUEST_RIP, &entry_eip);
-
-  SetCRBitsCorrectly(IA32_VMX_CR0_FIXED0_MSR, IA32_VMX_CR0_FIXED1_MSR, GUEST_CR0);
-  SetCRBitsCorrectly(IA32_VMX_CR4_FIXED0_MSR, IA32_VMX_CR4_FIXED1_MSR, GUEST_CR4);
-  ret = Init_VMCS_GuestState();
-
-  PrintTrace("InitGuestState returned\n");
+    int ret = 0;
+    ret = vmcs_write(field,val);
 
-  if (ret != VMX_SUCCESS) {
-    if (ret == VMX_FAIL_VALID) {
-      PrintTrace("Init Guest state: VMCS FAILED WITH ERROR\n");
-    } else {
-      PrintTrace("Init Guest state: Invalid VMCS\n");
+    if (ret != VMX_SUCCESS) {
+        PrintError("VMWRITE error on %s!: %d\n", v3_vmcs_field_to_str(field), ret);
+        return 1;
     }
-    return ret;
-  }
-  PrintTrace("GUEST_RSP: %x (%u)\n", guest_esp, (uint_t)guest_esp);
-  VMCS_WRITE(GUEST_RSP, &guest_esp);
-
-  //  tmpReg = 0x4100;
-  tmpReg = 0xffffffff;
-  if (VMCS_WRITE(EXCEPTION_BITMAP, &tmpReg) != VMX_SUCCESS) {
-    PrintInfo("Bitmap error\n");
-  }
-
-  ConfigureExits(vm);
-
-  PrintTrace("VMCS_LAUNCH\n");
-
-  vm->state=VM_VMXASSIST_STARTUP;
-
-  vmm_ret = SAFE_VM_LAUNCH();
-
-  PrintTrace("VMM error %d\n", vmm_ret);
-
-  return vmm_ret;
-}
-
-
-
-  
-int VMLaunch(struct VMDescriptor *vm) 
-{
-  VMCS * vmcs = CreateVMCS();
-  int rc;
-
-  ullong_t vmcs_ptr = (ullong_t)((uint_t)vmcs);
-  uint_t top = (vmcs_ptr >> 32) & 0xffffffff;
-  uint_t bottom = (vmcs_ptr) & 0xffffffff;
 
-  theVM.vmcsregion = vmcs;
-  theVM.descriptor = *vm;
-
-  PrintTrace("vmcs_ptr_top=%x vmcs_ptr_bottom=%x, eip=%x\n", top, bottom, vm->entry_ip);
-  rc = MyLaunch(&theVM); // vmcs_ptr, vm->entry_ip, vm->exit_eip, vm->guest_esp);
-  PrintTrace("Returned from MyLaunch();\n");
-  return rc;
+    return 0;
 }
 
-
-
-
-//
-//
-//  END CRUFT
-//
-//
-
-#endif
-
 static int update_vmcs_host_state(struct guest_info * info) {
+    int vmx_ret = 0;
     addr_t tmp;
     struct vmx_data * arch_data = (struct vmx_data *)(info->vmm_data);
     struct v3_msr tmp_msr;
@@ -299,38 +56,38 @@ static int update_vmcs_host_state(struct guest_info * info) {
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_CR0, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_CR0, tmp);
 
 
     __asm__ __volatile__ ( "movq %%cr3, %0; "          
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_CR3, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_CR3, tmp);
 
 
     __asm__ __volatile__ ( "movq %%cr4, %0; "          
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_CR4, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_CR4, tmp);
 
 
 
-    vmcs_write(VMCS_HOST_GDTR_BASE, arch_data->host_state.gdtr.base);
-    vmcs_write(VMCS_HOST_IDTR_BASE, arch_data->host_state.idtr.base);
-    vmcs_write(VMCS_HOST_TR_BASE, arch_data->host_state.tr.base);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_GDTR_BASE, arch_data->host_state.gdtr.base);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_IDTR_BASE, arch_data->host_state.idtr.base);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_TR_BASE, arch_data->host_state.tr.base);
 
 #define FS_BASE_MSR 0xc0000100
 #define GS_BASE_MSR 0xc0000101
 
     // FS.BASE MSR
     v3_get_msr(FS_BASE_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_HOST_FS_BASE, tmp_msr.value);    
+    vmx_ret |= check_vmcs_write(VMCS_HOST_FS_BASE, tmp_msr.value);    
 
     // GS.BASE MSR
     v3_get_msr(GS_BASE_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_HOST_GS_BASE, tmp_msr.value);    
+    vmx_ret |= check_vmcs_write(VMCS_HOST_GS_BASE, tmp_msr.value);    
 
 
 
@@ -338,39 +95,39 @@ static int update_vmcs_host_state(struct guest_info * info) {
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_CS_SELECTOR, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_CS_SELECTOR, tmp);
 
     __asm__ __volatile__ ( "movq %%ss, %0; "           
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_SS_SELECTOR, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_SS_SELECTOR, tmp);
 
     __asm__ __volatile__ ( "movq %%ds, %0; "           
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_DS_SELECTOR, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_DS_SELECTOR, tmp);
 
     __asm__ __volatile__ ( "movq %%es, %0; "           
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_ES_SELECTOR, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_ES_SELECTOR, tmp);
 
     __asm__ __volatile__ ( "movq %%fs, %0; "           
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_FS_SELECTOR, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_FS_SELECTOR, tmp);
 
     __asm__ __volatile__ ( "movq %%gs, %0; "           
                           : "=q"(tmp)
                           :
     );
-    vmcs_write(VMCS_HOST_GS_SELECTOR, tmp);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_GS_SELECTOR, tmp);
 
-    vmcs_write(VMCS_HOST_TR_SELECTOR, arch_data->host_state.tr.selector);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_TR_SELECTOR, arch_data->host_state.tr.selector);
 
 
 #define SYSENTER_CS_MSR 0x00000174
@@ -379,27 +136,22 @@ static int update_vmcs_host_state(struct guest_info * info) {
 
    // SYSENTER CS MSR
     v3_get_msr(SYSENTER_CS_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_HOST_SYSENTER_CS, tmp_msr.value);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_SYSENTER_CS, tmp_msr.lo);
 
     // SYSENTER_ESP MSR
     v3_get_msr(SYSENTER_ESP_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_HOST_SYSENTER_ESP, tmp_msr.value);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_SYSENTER_ESP, tmp_msr.value);
 
     // SYSENTER_EIP MSR
     v3_get_msr(SYSENTER_EIP_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_HOST_SYSENTER_EIP, tmp_msr.value);
+    vmx_ret |= check_vmcs_write(VMCS_HOST_SYSENTER_EIP, tmp_msr.value);
 
-
-
-    return 0;
+    return vmx_ret;
 }
 
 
 
 
-static addr_t vmxon_ptr_phys;
-extern int v3_vmx_exit_handler();
-extern int v3_vmx_vmlaunch();
 
 
 #if 0
@@ -414,8 +166,8 @@ static uint32_t sanitize_bits1(uint32_t msr_num, uint32_t val) {
 
     PrintDebug("MSR %x = %x : %x \n", msr_num, mask_msr.hi, mask_msr.lo);
 
-    val &= mask_msr.lo;
-    val &= mask_msr.hi;
+    val |= mask_msr.lo;
+    val |= mask_msr.hi;
   
     return val;
 }
@@ -437,8 +189,8 @@ static addr_t sanitize_bits2(uint32_t msr_num0, uint32_t msr_num1, addr_t val) {
 
     PrintDebug("MSR %x = %p, %x = %p \n", msr_num0, (void*)msr0_val, msr_num1, (void*)msr1_val);
 
-    val &= msr0_val;
-    val &= msr1_val;
+    val |= msr0_val;
+    val |= msr1_val;
 
     return val;
 }
@@ -455,19 +207,6 @@ static int setup_base_host_state() {
 
 #endif
 
-static int inline check_vmcs_write(vmcs_field_t field, addr_t val)
-{
-    int ret = 0;
-    ret = vmcs_write(field,val);
-
-    if (ret != VMX_SUCCESS) {
-        PrintError("VMWRITE error on %s!: %d\n", v3_vmcs_field_to_str(field), ret);
-        return 1;
-    }
-
-    return 0;
-}
-
 
 static void inline translate_segment_access(struct v3_segment * v3_seg,  
                                            struct vmcs_segment_access * access)
@@ -492,76 +231,76 @@ static int inline vmcs_write_guest_segments(struct guest_info* info)
     /* CS Segment */
     translate_segment_access(&(info->segments.cs), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_CS_BASE, info->segments.cs.base);
-    ret &= check_vmcs_write(VMCS_GUEST_CS_SELECTOR, info->segments.cs.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_CS_LIMIT, info->segments.cs.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_CS_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_CS_BASE, info->segments.cs.base);
+    ret |= check_vmcs_write(VMCS_GUEST_CS_SELECTOR, info->segments.cs.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_CS_LIMIT, info->segments.cs.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_CS_ACCESS, access.value);
 
     /* SS Segment */
     translate_segment_access(&(info->segments.ss), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_SS_BASE, info->segments.ss.base);
-    ret &= check_vmcs_write(VMCS_GUEST_SS_SELECTOR, info->segments.ss.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_SS_LIMIT, info->segments.ss.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_SS_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_SS_BASE, info->segments.ss.base);
+    ret |= check_vmcs_write(VMCS_GUEST_SS_SELECTOR, info->segments.ss.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_SS_LIMIT, info->segments.ss.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_SS_ACCESS, access.value);
 
     /* DS Segment */
     translate_segment_access(&(info->segments.ds), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_DS_BASE, info->segments.ds.base);
-    ret &= check_vmcs_write(VMCS_GUEST_DS_SELECTOR, info->segments.ds.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_DS_LIMIT, info->segments.ds.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_DS_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_DS_BASE, info->segments.ds.base);
+    ret |= check_vmcs_write(VMCS_GUEST_DS_SELECTOR, info->segments.ds.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_DS_LIMIT, info->segments.ds.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_DS_ACCESS, access.value);
 
 
     /* ES Segment */
     translate_segment_access(&(info->segments.es), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_ES_BASE, info->segments.es.base);
-    ret &= check_vmcs_write(VMCS_GUEST_ES_SELECTOR, info->segments.es.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_ES_LIMIT, info->segments.es.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_ES_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_ES_BASE, info->segments.es.base);
+    ret |= check_vmcs_write(VMCS_GUEST_ES_SELECTOR, info->segments.es.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_ES_LIMIT, info->segments.es.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_ES_ACCESS, access.value);
 
     /* FS Segment */
     translate_segment_access(&(info->segments.fs), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_FS_BASE, info->segments.fs.base);
-    ret &= check_vmcs_write(VMCS_GUEST_FS_SELECTOR, info->segments.fs.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_FS_LIMIT, info->segments.fs.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_FS_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_FS_BASE, info->segments.fs.base);
+    ret |= check_vmcs_write(VMCS_GUEST_FS_SELECTOR, info->segments.fs.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_FS_LIMIT, info->segments.fs.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_FS_ACCESS, access.value);
 
     /* GS Segment */
     translate_segment_access(&(info->segments.gs), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_GS_BASE, info->segments.gs.base);
-    ret &= check_vmcs_write(VMCS_GUEST_GS_SELECTOR, info->segments.gs.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_GS_LIMIT, info->segments.gs.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_GS_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_GS_BASE, info->segments.gs.base);
+    ret |= check_vmcs_write(VMCS_GUEST_GS_SELECTOR, info->segments.gs.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_GS_LIMIT, info->segments.gs.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_GS_ACCESS, access.value);
 
     /* LDTR segment */
     translate_segment_access(&(info->segments.ldtr), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_LDTR_BASE, info->segments.ldtr.base);
-    ret &= check_vmcs_write(VMCS_GUEST_LDTR_SELECTOR, info->segments.ldtr.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_LDTR_LIMIT, info->segments.ldtr.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_LDTR_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_LDTR_BASE, info->segments.ldtr.base);
+    ret |= check_vmcs_write(VMCS_GUEST_LDTR_SELECTOR, info->segments.ldtr.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_LDTR_LIMIT, info->segments.ldtr.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_LDTR_ACCESS, access.value);
 
     /* TR Segment */
     translate_segment_access(&(info->segments.tr), &access);
 
-    ret &= check_vmcs_write(VMCS_GUEST_TR_BASE, info->segments.tr.base);
-    ret &= check_vmcs_write(VMCS_GUEST_TR_SELECTOR, info->segments.ldtr.selector);
-    ret &= check_vmcs_write(VMCS_GUEST_TR_LIMIT, info->segments.tr.limit);
-    ret &= check_vmcs_write(VMCS_GUEST_TR_ACCESS, access.value);
+    ret |= check_vmcs_write(VMCS_GUEST_TR_BASE, info->segments.tr.base);
+    ret |= check_vmcs_write(VMCS_GUEST_TR_SELECTOR, info->segments.ldtr.selector);
+    ret |= check_vmcs_write(VMCS_GUEST_TR_LIMIT, info->segments.tr.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_TR_ACCESS, access.value);
 
     /* GDTR Segment */
 
-    ret &= check_vmcs_write(VMCS_GUEST_GDTR_BASE, info->segments.gdtr.base);
-    ret &= check_vmcs_write(VMCS_GUEST_GDTR_LIMIT, info->segments.gdtr.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_GDTR_BASE, info->segments.gdtr.base);
+    ret |= check_vmcs_write(VMCS_GUEST_GDTR_LIMIT, info->segments.gdtr.limit);
 
     /* IDTR Segment*/
-    ret &= check_vmcs_write(VMCS_GUEST_IDTR_BASE, info->segments.idtr.base);
-    ret &= check_vmcs_write(VMCS_GUEST_IDTR_LIMIT, info->segments.idtr.limit);
+    ret |= check_vmcs_write(VMCS_GUEST_IDTR_BASE, info->segments.idtr.base);
+    ret |= check_vmcs_write(VMCS_GUEST_IDTR_LIMIT, info->segments.idtr.limit);
 
     return ret;
 }
@@ -574,7 +313,8 @@ static void setup_v8086_mode_for_boot(struct guest_info * vm_info)
     ((struct rflags *)&(vm_info->ctrl_regs.rflags))->iopl = 3;
 
    
-    vm_info->rip = 0xfff0;
+    vm_info->rip = 0xd0000;
+    vm_info->vm_regs.rsp = 0x80000;
 
     vm_info->segments.cs.selector = 0xf000;
     vm_info->segments.cs.base = 0xf000 << 4;
@@ -636,7 +376,6 @@ static addr_t allocate_vmcs()
 }
 
 
-
 static int init_vmcs_bios(struct guest_info * vm_info) 
 {
 
@@ -644,10 +383,9 @@ static int init_vmcs_bios(struct guest_info * vm_info)
 
     // TODO: Fix vmcs fields so they're 32-bit
     struct vmx_data * vmx_data = (struct vmx_data *)vm_info->vmm_data;
-    int vmx_ret;
+    int vmx_ret = 0;
 
-    // Have to do a whole lot of flag setting here
-    PrintDebug("Clearing VMCS\n");
+    PrintDebug("Clearing VMCS: %p\n",(void*)vmx_data->vmcs_ptr_phys);
     vmx_ret = vmcs_clear(vmx_data->vmcs_ptr_phys);
 
     if (vmx_ret != VMX_SUCCESS) {
@@ -667,16 +405,25 @@ static int init_vmcs_bios(struct guest_info * vm_info)
 
     /* Write VMX Control Fields */
     v3_get_msr(VMX_PINBASED_CTLS_MSR,&(tmp_msr.hi),&(tmp_msr.lo));
-    vmcs_write(VMCS_PIN_CTRLS, tmp_msr.lo);
+    /* Add NMI exiting */
+    tmp_msr.lo |= NMI_EXIT;
+    check_vmcs_write(VMCS_PIN_CTRLS, tmp_msr.lo);
 
     v3_get_msr(VMX_PROCBASED_CTLS_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_PROC_CTRLS, tmp_msr.lo);
+    /* Add unconditional I/O */
+    tmp_msr.lo |= UNCOND_IO_EXIT;
+    check_vmcs_write(VMCS_PROC_CTRLS, tmp_msr.lo);
 
     v3_get_msr(VMX_EXIT_CTLS_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_EXIT_CTRLS, tmp_msr.lo);
+    tmp_msr.lo |= HOST_ADDR_SPACE_SIZE;
+    check_vmcs_write(VMCS_EXIT_CTRLS, tmp_msr.lo);
+
 
     v3_get_msr(VMX_ENTRY_CTLS_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
-    vmcs_write(VMCS_ENTRY_CTRLS, tmp_msr.lo);
+    check_vmcs_write(VMCS_ENTRY_CTRLS, tmp_msr.lo);
+
+
+    check_vmcs_write(VMCS_EXCP_BITMAP, 0xffffffff);
 
     /* Cache GDTR, IDTR, and TR in host struct */
     struct {
@@ -692,7 +439,8 @@ static int init_vmcs_bios(struct guest_info * vm_info)
                         : "q"(&tmp_seg)
                         : "memory"
                         );
-    vmx_data->host_state.gdtr.base = gdtr_base = tmp_seg.base;
+    gdtr_base = tmp_seg.base;
+    vmx_data->host_state.gdtr.base = gdtr_base;
 
     __asm__ __volatile__(
                         "sidt (%0);"
@@ -710,14 +458,16 @@ static int init_vmcs_bios(struct guest_info * vm_info)
                         );
     vmx_data->host_state.tr.selector = tmp_seg.selector;
 
-    struct tss_descriptor desc = ((struct tss_descriptor *)gdtr_base)[tmp_seg.selector];
-    
+    /* The GDTR *index* is bits 3-15 of the selector. */
+    struct tss_descriptor * desc = (struct tss_descriptor *)
+                        (gdtr_base + 8*(tmp_seg.selector>>3));
+
     tmp_seg.base = (
-                   (desc.base1) |
-                   (desc.base2 << 16) |
-                   (desc.base3 << 24) |
+                   (desc->base1) |
+                   (desc->base2 << 16) |
+                   (desc->base3 << 24) |
 #ifdef __V3_64BIT__
-                   ((uint64_t)desc.base4 << 32)
+                   ((uint64_t)desc->base4 << 32)
 #else 
                    (0)
 #endif
@@ -725,36 +475,44 @@ static int init_vmcs_bios(struct guest_info * vm_info)
 
     vmx_data->host_state.tr.base = tmp_seg.base;
 
-    update_vmcs_host_state(vm_info);
-    vmcs_write(VMCS_HOST_RIP, (addr_t)&v3_vmx_exit_handler);
+    if(update_vmcs_host_state(vm_info)) {
+        PrintError("Could not write host state\n");
+        return -1;
+    }
 
     // Setup guest state 
     // TODO: This is not 32-bit safe!
-    vmx_ret &= check_vmcs_write(VMCS_GUEST_RIP, vm_info->rip);
-    vmx_ret &= check_vmcs_write(VMCS_GUEST_CR0, 0x60000010);
+    vmx_ret |= check_vmcs_write(VMCS_GUEST_RIP, vm_info->rip);
+    vmx_ret |= check_vmcs_write(VMCS_GUEST_RSP, vm_info->vm_regs.rsp);
+    vmx_ret |= check_vmcs_write(VMCS_GUEST_CR0, 0x80000021);
 
-    vmx_ret &= vmcs_write_guest_segments(vm_info);
+    vmx_ret |= vmcs_write_guest_segments(vm_info);
 
-    vmx_ret &= check_vmcs_write(VMCS_GUEST_RFLAGS, vm_info->ctrl_regs.rflags);
-    vmx_ret &= check_vmcs_write(VMCS_LINK_PTR, 0xffffffffffffffff);
+    vmx_ret |= check_vmcs_write(VMCS_GUEST_RFLAGS, vm_info->ctrl_regs.rflags);
+    vmx_ret |= check_vmcs_write(VMCS_LINK_PTR, 0xffffffffffffffff);
 
     if (vmx_ret != 0) {
        PrintError("Could not initialize VMCS segments\n");
         return -1;
     }
 
-    v3_print_vmcs_guest_state();
-    return 0;
-}
+#define VMXASSIST_START 0x000d0000
+    extern uint8_t vmxassist_start[];
+    extern uint8_t vmxassist_end[];
 
-int v3_vmx_handle_exit()
-{
-    PrintDebug("Exit taken!\n");
+    addr_t vmxassist_dst = 0;
+    if(guest_pa_to_host_va(vm_info, VMXASSIST_START, &vmxassist_dst) == -1) {
+        PrintError("Could not find VMXASSIST destination\n");
+        return -1;
+    }
+    memcpy((void*)vmxassist_dst, vmxassist_start, vmxassist_end-vmxassist_start);
+
+    v3_print_vmcs_host_state();
+    v3_print_vmcs_guest_state();
     return 0;
 }
 
 static int init_vmx_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-    PrintDebug("Entering init_vmx_guest\n");
     v3_pre_config_guest(info, config_ptr);
 
     struct vmx_data * data = NULL;
@@ -777,7 +535,7 @@ static int init_vmx_guest(struct guest_info * info, struct v3_vm_config * config
         return -1;
     }
 
-    //v3_post_config_guest(info, config_ptr);
+     //v3_post_config_guest(info, config_ptr);
 
     return 0;
 }
@@ -789,15 +547,15 @@ static int start_vmx_guest(struct guest_info* info) {
 
     PrintDebug("Attempting VMLAUNCH\n");
 
-    ret = v3_vmx_vmlaunch();
-
-    PrintDebug("Returned from VMLAUNCH\n");
-
-    vmcs_read(VMCS_INSTR_ERR, &error, 4);
-
+    ret = v3_vmx_vmlaunch(&(info->vm_regs));
     if (ret != VMX_SUCCESS) {
+        vmcs_read(VMCS_INSTR_ERR, &error, 4);
         PrintError("VMLAUNCH failed: %d\n", error);
+
+        v3_print_vmcs_guest_state();
+        v3_print_vmcs_host_state();
     }
+    PrintDebug("Returned from VMLAUNCH ret=%d(0x%x)\n", ret, ret);
 
     return -1;
 }
@@ -877,6 +635,7 @@ void v3_init_vmx(struct v3_ctrl_ops * vm_ops) {
       //
     // Should check and return Error here.... 
 
+
     // Setup VMXON Region
     vmxon_ptr_phys = allocate_vmcs();
     PrintDebug("VMXON pointer: 0x%p\n", (void*)vmxon_ptr_phys);
@@ -901,3 +660,4 @@ void v3_init_vmx(struct v3_ctrl_ops * vm_ops) {
     vm_ops->has_nested_paging = &has_vmx_nested_paging;
 
 }
+