separated configuration to 2 phases pre/post

diff --git a/palacios/include/palacios/vmm_config.h b/palacios/include/palacios/vmm_config.h
index 5b614e9..716e5b6 100644 (file)
--- a/palacios/include/palacios/vmm_config.h
+++ b/palacios/include/palacios/vmm_config.h
@@ -28,9 +28,9 @@
 #include <palacios/vmm.h>
 
 
+int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr);
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr);
 
-int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr);
-int v3_config_devices(struct guest_info * info, struct v3_vm_config * config_ptr);
 
 
 #endif // ! __V3VEE__

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index f02a894..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;
 }

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index f0befa8..4387f8b 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -55,6 +55,7 @@
 
 
 static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr);
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr);
 static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
 
 
@@ -71,9 +72,8 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v
 }
 
 
-
-int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-    extern v3_cpu_arch_t v3_cpu_type;
+int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+   extern v3_cpu_arch_t v3_cpu_type;
 
     // Amount of ram the Guest will have, rounded to a 4K page boundary
     info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
@@ -97,7 +97,6 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     // Initialize the memory map
     v3_init_shadow_map(info);
     
-    
     if ((v3_cpu_type == V3_SVM_REV3_CPU) && 
        (config_ptr->enable_nested_paging == 1)) {
        PrintDebug("Guest Page Mode: NESTED_PAGING\n");
@@ -107,32 +106,49 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
        v3_init_shadow_page_state(info);
        info->shdw_pg_mode = SHADOW_PAGING;
     }
+
+    if (config_ptr->enable_profiling) {
+       info->enable_profiler = 1;
+       v3_init_profiler(info);
+    } else {
+       info->enable_profiler = 0;
+    }
+
     
     // Initial CPU operating mode
     info->cpu_mode = REAL;
     info->mem_mode = PHYSICAL_MEM;
-    
+
+    return 0;
+}
+
+
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
     // Configure the memory map for the guest
     if (setup_memory_map(info, config_ptr) == -1) {
        PrintError("Setting up guest memory map failed...\n");
        return -1;
     }
     
-
-    if (config_ptr->enable_profiling) {
-       info->enable_profiler = 1;
-       v3_init_profiler(info);
-    } else {
-       info->enable_profiler = 0;
-    }
-
     //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-    
-    // Setup initial cpu register state
-    info->rip = 0xfff0;
-    info->vm_regs.rsp = 0x0;
   
-    
+    if (setup_devices(info, config_ptr) == -1) {
+       PrintError("Failed to setup devices\n");
+       return -1;
+    }
+
+    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;
+
     return 0;
 }
 
@@ -191,7 +207,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 
 
 
-int v3_config_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
     struct vm_device * ide = NULL;
     struct vm_device * ramdisk = NULL;