various fixes. Hopefully this fixes the transient shutdown bug...

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 3707d1f..d617b61 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -41,6 +41,7 @@
 #include <palacios/vmm_direct_paging.h>
 
 #include <palacios/vmm_ctrl_regs.h>
+#include <palacios/vmm_config.h>
 
 
 extern void v3_stgi();
@@ -204,6 +205,9 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
     if (vm_info->shdw_pg_mode == SHADOW_PAGING) {
        PrintDebug("Creating initial shadow page table\n");
        
+       /* JRL: This is a performance killer, and a simplistic solution */
+       /* We need to fix this */
+       ctrl_area->TLB_CONTROL = 1;
        ctrl_area->guest_ASID = 1;
        
        
@@ -236,9 +240,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 
        ctrl_area->exceptions.pf = 1;
 
-       /* JRL: This is a performance killer, and a simplistic solution */
-       /* We need to fix this */
-       ctrl_area->TLB_CONTROL = 1;
+
 
        guest_state->g_pat = 0x7040600070406ULL;
 
@@ -277,14 +279,19 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 }
 
 
-static int init_svm_guest(struct guest_info *info) {
+static int init_svm_guest(struct guest_info *info, struct v3_vm_config * config_ptr) {
+    v3_config_guest(info, config_ptr);
+
     PrintDebug("Allocating VMCB\n");
     info->vmm_data = (void*)Allocate_VMCB();
 
+    v3_config_devices(info, config_ptr);
+
     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->rip = 0;