fix 32 bit vmx entry to match i386/gcc calling conventions

[palacios.git] / palacios / src / palacios / vmx.c

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 7cea8a1..3417767 100644 (file)
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -402,8 +402,12 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state)
 
     info->dbg_regs.dr7 = 0x400;
 
+#ifdef __V3_64BIT__
     vmx_ret |= check_vmcs_write(VMCS_LINK_PTR, (addr_t)0xffffffffffffffffULL);
-    
+#else
+    vmx_ret |= check_vmcs_write(VMCS_LINK_PTR, (addr_t)0xffffffffUL);
+    vmx_ret |= check_vmcs_write(VMCS_LINK_PTR_HIGH, (addr_t)0xffffffffUL);
+#endif
 
     if (v3_update_vmcs_ctrl_fields(info)) {
         PrintError("Could not write control fields!\n");
@@ -744,35 +748,29 @@ int v3_vmx_enter(struct guest_info * info) {
 }
 
 
-int v3_start_vmx_guest(struct guest_info* info) {
+int v3_start_vmx_guest(struct guest_info * info) {
+
+    PrintDebug("Starting VMX core %u\n", info->cpu_id);
+
+    if (info->cpu_id == 0) {
+       info->core_run_state = CORE_RUNNING;
+       info->vm_info->run_state = VM_RUNNING;
+    } else {
 
-    PrintDebug("Starting VMX core %u\n",info->cpu_id);
-    if (info->cpu_mode==INIT) {
-        PrintDebug("VMX core %u: I am an AP in INIT mode, waiting for that to change\n",info->cpu_id);
-        while (info->cpu_mode==INIT) {
+        PrintDebug("VMX core %u: Waiting for core initialization\n", info->cpu_id);
+
+        while (info->core_run_state == CORE_STOPPED) {
             v3_yield(info);
             //PrintDebug("VMX core %u: still waiting for INIT\n",info->cpu_id);
         }
-        PrintDebug("VMX core %u: I am out of INIT\n",info->cpu_id);
-        if (info->cpu_mode==SIPI) {
-            PrintDebug("VMX core %u: I am waiting on a SIPI to set my starting address\n",info->cpu_id);
-            while (info->cpu_mode==SIPI) {
-                v3_yield(info);
-                //PrintDebug("VMX core %u: still waiting for SIPI\n",info->cpu_id);
-            }
-        }
-        PrintDebug("VMX core %u: I have my SIPI\n", info->cpu_id);
+       
+       PrintDebug("VMX core %u initialized\n", info->cpu_id);
     }
 
-    if (info->cpu_mode!=REAL) {
-        PrintError("VMX core %u: I am not in REAL mode at launch!  Huh?!\n", info->cpu_id);
-        return -1;
-    }
 
     PrintDebug("VMX core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x),  RIP=0x%p\n",
-               info->cpu_id, info->segments.cs.selector, (void*)(info->segments.cs.base),
-               info->segments.cs.limit,(void*)(info->rip));
-
+               info->cpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base),
+               info->segments.cs.limit, (void *)(info->rip));
 
 
     PrintDebug("VMX core %u: Launching VMX VM\n", info->cpu_id);