X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_debug.c;h=85bd8d22300ee734d5f6a593a2d0f496b7ad5f83;hb=3e937e5468169b8183a22a90f6d07ff370abde0c;hp=cc31a524d6febd92297e38c40e9d7faa6a0615f3;hpb=ec9f38e306b02bb98029fb950bcb4d0bd0c3aed2;p=palacios.git

diff --git a/palacios/src/palacios/vmm_debug.c b/palacios/src/palacios/vmm_debug.c
index cc31a52..85bd8d2 100644
--- a/palacios/src/palacios/vmm_debug.c
+++ b/palacios/src/palacios/vmm_debug.c
@@ -152,10 +152,20 @@ void v3_print_segments(struct v3_segments * segs) {
 
     for (i = 0; seg_names[i] != NULL; i++) {
 
-	V3_Print(VM_NONE, VCORE_NONE, "\t%s: Sel=%x, base=%p, limit=%x (long_mode=%d, db=%d)\n", seg_names[i], seg_ptr[i].selector, 
-		   (void *)(addr_t)seg_ptr[i].base, seg_ptr[i].limit,
-		   seg_ptr[i].long_mode, seg_ptr[i].db);
-
+	V3_Print(VM_NONE, VCORE_NONE, "\t%s: selector=0x%x, base=%p, limit=0x%x type=0x%x system=0x%x dpl=0x%x present=0x%x avail=0x%x long_mode=0x%x db=0x%x granularity=0x%x unusable=0x%x\n", 
+		 seg_names[i], 
+		 seg_ptr[i].selector, 
+		 (void *)(addr_t)seg_ptr[i].base, 
+		 seg_ptr[i].limit,
+		 seg_ptr[i].type,
+		 seg_ptr[i].system,
+		 seg_ptr[i].dpl,
+		 seg_ptr[i].present,
+		 seg_ptr[i].avail,
+		 seg_ptr[i].long_mode,
+		 seg_ptr[i].db,
+		 seg_ptr[i].granularity,
+		 seg_ptr[i].unusable);
     }
 }
 
@@ -396,17 +406,21 @@ void v3_print_backtrace(struct guest_info * core) {
 		tmp_ptr += 3; // pass over symbol type
 
 		if (sym_offset > rip_val) {
-		    char * end_ptr = strchr(sym_ptr, '\n');
-
-		    if (end_ptr) {
-			*end_ptr = 0; // null terminate symbol...
+		    if (sym_ptr) {
+			char * end_ptr = strchr(sym_ptr, '\n');
+			
+			if (end_ptr) {
+			    *end_ptr = 0; // null terminate symbol...
+			}
+			sym_name = sym_ptr;
+		    } else {
+			sym_name = NULL;
 		    }
-
-		    sym_name = sym_ptr;
 		    break;
 		}
 
 		sym_ptr = tmp_ptr;
+
 		{ 
 		    char * end_ptr2 = strchr(tmp_ptr, '\n');
 
@@ -488,6 +502,11 @@ void v3_print_idt(struct guest_info * core, addr_t idtr_base) {
         PrintError(core->vm_info, core, "idtr base address != linear translation, might be something funky with cs\n");
     }
 
+    if (!base_hva) {
+	PrintError(core->vm_info, core "idtr address does not translate!  skipping.\n");
+	return ;
+    }
+
     int i;
     char *types[16] = {"  ILGL","aTSS16","   LDT","bTSS16","call16","  task","intr16","trap16",
         "  ILGL","aTSS32","  ILGL","bTSS32","call32","  ILGL","intr32","trap32"};
@@ -533,6 +552,11 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) {
         PrintError(core->vm_info, core, "gdtr base address != linear translation, might be something funky with cs\n");
     }
 
+    if (!base_hva) {
+	PrintError(core->vm_info, core "gdtr address does not translate!  skipping.\n");
+	return ;
+    }
+
     int i;
     char* cd[2] = {"data","code"};
     // TODO: handle possibility of gate/segment descriptor
@@ -600,6 +624,11 @@ void v3_print_idt(struct guest_info * core, addr_t idtr_base) {
         PrintError(core->vm_info, core, "idtr base address != linear translation, might be something funky with cs\n");
     }
 
+    if (!base_hva) {
+	PrintError(core->vm_info, core, "idtr address does not translate!  skipping.\n");
+	return ;
+    }
+
     int i;
     char *types[16] = {"ILGL","ILGL"," LDT","ILGL","ILGL","ILGL","ILGL","ILGL","ILGL",
         "aTSS","ILGL","bTSS","call","ILGL","intr","trap"};
@@ -645,6 +674,11 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) {
         PrintError(core->vm_info, core, "gdtr base address != linear translation, might be something funky with cs\n");
     }
 
+    if (!base_hva) {
+	PrintError(core->vm_info, core, "gdtr address does not translate!  skipping.\n");
+	return ;
+    }
+
     int i;
     char* cd[2] = {"data","code"};
     // TODO: handle possibility of gate/segment descriptor
@@ -693,6 +727,11 @@ void v3_print_ldt(struct guest_info * core, addr_t ldtr_base) {
         PrintError(core->vm_info, core, "ldtr base address != linear translation, might be something funky with cs\n");
     }
 
+    if (!base_hva) {
+	PrintError(core->vm_info, core, "ldtr address does not translate!  skipping.\n");
+	return ;
+    }
+
     int i;
     char* cd[2] = {"data","code"};
     // TODO: handle possibility of gate/segment descriptor
@@ -740,6 +779,12 @@ void v3_print_tss(struct guest_info * core, addr_t tr_base) {
     if (tr_base != get_addr_linear(core, tr_base, &(core->segments.cs))) {
         PrintError(core->vm_info, core, "tr base address != linear translation, might be something funky with cs\n");
     }
+
+    if (!base_hva) {
+	PrintError(core->vm_info, core, "tr address does not translate!  skipping.\n");
+	return ;
+    }
+
     t=(struct tss_long*)base_hva;
 
     V3_Print(core->vm_info, core," res1 : 0x%llx\n", (uint64_t) t->res1);