separated configuration to 2 phases pre/post

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index e1f5034..9c58c25 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -67,10 +67,11 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
     uint_t i;
 
 
-    guest_state->rsp = vm_info->vm_regs.rsp;
-    // guest_state->rip = vm_info->rip;
+    //
+    guest_state->rsp = 0x00;
     guest_state->rip = 0xfff0;
 
+
     guest_state->cpl = 0;
 
     guest_state->efer |= EFER_MSR_svm_enable;
@@ -245,29 +246,18 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 }
 
 
-static int init_svm_guest(struct guest_info *info, struct v3_vm_config * config_ptr) {
-    v3_config_guest(info, config_ptr);
+static int init_svm_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
-    PrintDebug("Allocating VMCB\n");
-    info->vmm_data = (void*)Allocate_VMCB();
 
-    Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info);
+    v3_pre_config_guest(info, config_ptr);
 
-    v3_config_devices(info, config_ptr);
+    PrintDebug("Allocating VMCB\n");
+    info->vmm_data = (void*)Allocate_VMCB();
 
     PrintDebug("Initializing VMCB (addr=%p)\n", (void *)info->vmm_data);
+    Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info);
 
-
-    info->run_state = VM_STOPPED;
-
-    info->vm_regs.rdi = 0;
-    info->vm_regs.rsi = 0;
-    info->vm_regs.rbp = 0;
-    info->vm_regs.rsp = 0;
-    info->vm_regs.rbx = 0;
-    info->vm_regs.rdx = 0;
-    info->vm_regs.rcx = 0;
-    info->vm_regs.rax = 0;
+    v3_post_config_guest(info, config_ptr);
 
     return 0;
 }
@@ -306,17 +296,18 @@ static int start_svm_guest(struct guest_info *info) {
 
 #else 
 
-#define MSR_STAR              0xc0000081
 #define MSR_SYSENTER_CS       0x00000174
 #define MSR_SYSENTER_ESP      0x00000175
 #define MSR_SYSENTER_EIP      0x00000176
-       struct v3_msr host_star;
+
        struct v3_msr host_sysenter_cs;
        struct v3_msr host_sysenter_esp;
        struct v3_msr host_sysenter_eip;
 
 #endif
 
+#define MSR_STAR              0xc0000081
+       struct v3_msr host_star;
 
 
        /*
@@ -336,11 +327,8 @@ static int start_svm_guest(struct guest_info *info) {
        v3_get_msr(MSR_SYSENTER_CS, &(host_sysenter_cs.hi), &(host_sysenter_cs.lo));
        v3_get_msr(MSR_SYSENTER_ESP, &(host_sysenter_esp.hi), &(host_sysenter_esp.lo));
        v3_get_msr(MSR_SYSENTER_EIP, &(host_sysenter_eip.hi), &(host_sysenter_eip.lo));
-       v3_get_msr(MSR_STAR, &(host_star.hi), &(host_star.lo));
 #endif
-
-
-
+       v3_get_msr(MSR_STAR, &(host_star.hi), &(host_star.lo));
 
        rdtscll(info->time_state.cached_host_tsc);
        //    guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
@@ -359,9 +347,8 @@ static int start_svm_guest(struct guest_info *info) {
        v3_set_msr(MSR_SYSENTER_CS, host_sysenter_cs.hi, host_sysenter_cs.lo);
        v3_set_msr(MSR_SYSENTER_ESP, host_sysenter_esp.hi, host_sysenter_esp.lo);
        v3_set_msr(MSR_SYSENTER_EIP, host_sysenter_eip.hi, host_sysenter_eip.lo);
-       v3_set_msr(MSR_STAR, host_star.hi, host_star.lo);
 #endif
-
+       v3_set_msr(MSR_STAR, host_star.hi, host_star.lo);
 
        
        //PrintDebug("SVM Returned\n");