X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=2e720dad18cdb9ddd4b6e2dbb1ebf3e57c103fda;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=37e022438aa417f53291a5bf7ea6583bb438755a;hpb=a1e0475bbefa968791679c5e71232ddca522868b;p=palacios.releases.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 37e0224..2e720da 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -1,3 +1,7 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
+
 #include <palacios/svm.h>
 #include <palacios/vmm.h>
 
@@ -68,6 +72,20 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   guest_state->efer |= EFER_MSR_svm_enable;
   guest_state->rflags = 0x00000002; // The reserved bit is always 1
   ctrl_area->svm_instrs.VMRUN = 1;
+  ctrl_area->svm_instrs.VMMCALL = 1;
+  ctrl_area->svm_instrs.VMLOAD = 1;
+  ctrl_area->svm_instrs.VMSAVE = 1;
+  ctrl_area->svm_instrs.STGI = 1;
+  ctrl_area->svm_instrs.CLGI = 1;
+  ctrl_area->svm_instrs.SKINIT = 1;
+  ctrl_area->svm_instrs.RDTSCP = 1;
+  ctrl_area->svm_instrs.ICEBP = 1;
+  ctrl_area->svm_instrs.WBINVD = 1;
+  ctrl_area->svm_instrs.MONITOR = 1;
+  ctrl_area->svm_instrs.MWAIT_always = 1;
+  ctrl_area->svm_instrs.MWAIT_if_armed = 1;
+
+
   ctrl_area->instrs.HLT = 1;
   // guest_state->cr0 = 0x00000001;    // PE 
   ctrl_area->guest_ASID = 1;
@@ -238,6 +256,8 @@ static int init_svm_guest(struct guest_info *info) {
   Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info);
   
 
+  info->run_state = VM_STOPPED;
+
   //  info->rip = 0;
 
   info->vm_regs.rdi = 0;
@@ -253,15 +273,20 @@ static int init_svm_guest(struct guest_info *info) {
 }
 
 
+
 // can we start a kernel thread here...
-static int start_svm_guest(struct guest_info *info) {
+ 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_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
   uint_t num_exits = 0;
 
+
+
   PrintDebug("Launching SVM VM (vmcb=%x)\n", info->vmm_data);
   //PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
+  info->run_state = VM_RUNNING;
+
   while (1) {
     ullong_t tmp_tsc;
 
@@ -295,6 +320,8 @@ static int start_svm_guest(struct guest_info *info) {
       addr_t host_addr;
       addr_t linear_addr = 0;
 
+      info->run_state = VM_ERROR;
+
       PrintDebug("SVM ERROR!!\n"); 
       
       PrintDebug("RIP: %x\n", guest_state->rip);
@@ -329,6 +356,7 @@ static int start_svm_guest(struct guest_info *info) {
 
 
 
+
 /* Checks machine SVM capability */
 /* Implemented from: AMD Arch Manual 3, sect 15.4 */ 
 int is_svm_capable() {