X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=9434e496c4fa8e8b3027d8f7ea8fcfb4418777a6;hb=5081e94397ad27675827df5a3e1fb64e80105374;hp=f02a8947c9450309bca78a358f8bb42ef219e945;hpb=df88a0e0e54e9f499fbf38b25863bc04c8a37934;p=palacios-OLD.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index f02a894..9434e49 100644
--- 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;
 }
@@ -276,7 +266,7 @@ static int init_svm_guest(struct guest_info *info, struct v3_vm_config * config_
 
 // can we start a kernel thread here...
 static int start_svm_guest(struct guest_info *info) {
-    vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
+    //    vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
     //  vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
     uint_t num_exits = 0;
 
@@ -391,23 +381,7 @@ static int start_svm_guest(struct guest_info *info) {
 	    
 	    PrintDebug("SVM ERROR!!\n"); 
       
-	    PrintDebug("RIP: %p\n", (void *)(addr_t)(guest_state->rip));
-
-
-	    linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs));
-
-
-	    PrintDebug("RIP Linear: %p\n", (void *)linear_addr);
-	    v3_print_segments(info);
-	    v3_print_ctrl_regs(info);
-	    if (info->shdw_pg_mode == SHADOW_PAGING) {
-		PrintDebug("Shadow Paging Guest Registers:\n");
-		PrintDebug("\tGuest CR0=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr0));
-		PrintDebug("\tGuest CR3=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr3));
-		PrintDebug("\tGuest EFER=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_efer.value));
-		// CR4
-	    }
-	    v3_print_GPRs(info);
+	    v3_print_guest_state(info);
 
 	    PrintDebug("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code);