added new debugging directives

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 8c650ff..28967fb 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -72,18 +72,30 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   // guest_state->cr0 = 0x00000001;    // PE 
   ctrl_area->guest_ASID = 1;
 
-  ctrl_area->exceptions.de = 1;
-  ctrl_area->exceptions.df = 1;
-  ctrl_area->exceptions.pf = 1;
-  ctrl_area->exceptions.ts = 1;
-  ctrl_area->exceptions.ss = 1;
-  ctrl_area->exceptions.ac = 1;
-  ctrl_area->exceptions.mc = 1;
-  ctrl_area->exceptions.gp = 1;
-  ctrl_area->exceptions.ud = 1;
-  ctrl_area->exceptions.np = 1;
-  ctrl_area->exceptions.of = 1;
-  ctrl_area->exceptions.nmi = 1;
+  
+  /*
+    ctrl_area->exceptions.de = 1;
+    ctrl_area->exceptions.df = 1;
+    
+    ctrl_area->exceptions.ts = 1;
+    ctrl_area->exceptions.ss = 1;
+    ctrl_area->exceptions.ac = 1;
+    ctrl_area->exceptions.mc = 1;
+    ctrl_area->exceptions.gp = 1;
+    ctrl_area->exceptions.ud = 1;
+    ctrl_area->exceptions.np = 1;
+    ctrl_area->exceptions.of = 1;
+  
+    ctrl_area->exceptions.nmi = 1;
+  */
+  // Debug of boot on physical machines - 7/14/08
+  ctrl_area->instrs.NMI=1;
+  ctrl_area->instrs.SMI=1;
+  ctrl_area->instrs.INIT=1;
+  ctrl_area->instrs.PAUSE=1;
+  ctrl_area->instrs.shutdown_evts=1;
+
+
 
   vm_info->vm_regs.rdx = 0x00000f00;
 
@@ -173,6 +185,8 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
     ctrl_area->instrs.INVLPG = 1;
     ctrl_area->instrs.INVLPGA = 1;
 
+    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;
@@ -261,12 +275,11 @@ static int start_svm_guest(struct guest_info *info) {
     EnableInts();
     CLGI();
 
-    PrintDebug("SVM Entry to rip=%x...\n", info->rip);
+    //    PrintDebug("SVM Entry to rip=%x...\n", info->rip);
 
     rdtscll(info->time_state.cached_host_tsc);
     guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
 
-    PrintDebug("Launching\n");
     safe_svm_launch((vmcb_t*)(info->vmm_data), &(info->vm_regs));
 
     rdtscll(tmp_tsc);
@@ -292,9 +305,9 @@ static int start_svm_guest(struct guest_info *info) {
 
 
       PrintDebug("RIP Linear: %x\n", linear_addr);
-      PrintV3Segments(&(info->segments));
-      PrintV3CtrlRegs(&(info->ctrl_regs));
-
+      PrintV3Segments(info);
+      PrintV3CtrlRegs(info);
+      PrintV3GPRs(info);
       
       if (info->mem_mode == PHYSICAL_MEM) {
        guest_pa_to_host_pa(info, linear_addr, &host_addr);