X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_debug.c;h=8e1819e9b7521ac84c5e0b9147847c9f941afdb6;hb=6d3926e16dc1ba6ca0144e65b737e432c48aaa91;hp=c2401e878e0ed8ff0b1bfc50f942a893297e6921;hpb=a20c07e3428f9aa55997befebca7a30721a71145;p=palacios.git diff --git a/palacios/src/palacios/vmm_debug.c b/palacios/src/palacios/vmm_debug.c index c2401e8..8e1819e 100644 --- a/palacios/src/palacios/vmm_debug.c +++ b/palacios/src/palacios/vmm_debug.c @@ -406,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'); @@ -483,14 +487,20 @@ void v3_print_idt(struct guest_info * core, addr_t idtr_base) { if (core->mem_mode == PHYSICAL_MEM) { - v3_gpa_to_hva(core, - get_addr_linear(core, idtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gpa_to_hva(core, + get_addr_linear(core, idtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } PrintError(core->vm_info, core, "Kind of weird that we got here.... physical mem?\n"); } else if (core->mem_mode == VIRTUAL_MEM) { - v3_gva_to_hva(core, - get_addr_linear(core, idtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gva_to_hva(core, + get_addr_linear(core, idtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } // SANITY CHECK @@ -533,14 +543,20 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) { } if (core->mem_mode == PHYSICAL_MEM) { - v3_gpa_to_hva(core, - get_addr_linear(core, gdtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gpa_to_hva(core, + get_addr_linear(core, gdtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } PrintError(core->vm_info, core, "Kind of weird that we got here.... physical mem?\n"); } else if (core->mem_mode == VIRTUAL_MEM) { - v3_gva_to_hva(core, - get_addr_linear(core, gdtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gva_to_hva(core, + get_addr_linear(core, gdtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } // SANITY CHECK @@ -606,13 +622,19 @@ void v3_print_idt(struct guest_info * core, addr_t idtr_base) { } if (core->mem_mode == PHYSICAL_MEM) { - v3_gpa_to_hva(core, - get_addr_linear(core, idtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gpa_to_hva(core, + get_addr_linear(core, idtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } else if (core->mem_mode == VIRTUAL_MEM) { - v3_gva_to_hva(core, - get_addr_linear(core, idtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gva_to_hva(core, + get_addr_linear(core, idtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } // SANITY CHECK @@ -656,13 +678,19 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) { } if (core->mem_mode == PHYSICAL_MEM) { - v3_gpa_to_hva(core, - get_addr_linear(core, gdtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gpa_to_hva(core, + get_addr_linear(core, gdtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } else if (core->mem_mode == VIRTUAL_MEM) { - v3_gva_to_hva(core, - get_addr_linear(core, gdtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gva_to_hva(core, + get_addr_linear(core, gdtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } // SANITY CHECK @@ -709,13 +737,19 @@ void v3_print_ldt(struct guest_info * core, addr_t ldtr_base) { } if (core->mem_mode == PHYSICAL_MEM) { - v3_gpa_to_hva(core, - get_addr_linear(core, ldtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gpa_to_hva(core, + get_addr_linear(core, ldtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } else if (core->mem_mode == VIRTUAL_MEM) { - v3_gva_to_hva(core, - get_addr_linear(core, ldtr_base, &(core->segments.cs)), - &base_hva); + if (v3_gva_to_hva(core, + get_addr_linear(core, ldtr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } // SANITY CHECK @@ -762,13 +796,19 @@ void v3_print_tss(struct guest_info * core, addr_t tr_base) { } if (core->mem_mode == PHYSICAL_MEM) { - v3_gpa_to_hva(core, - get_addr_linear(core, tr_base, &(core->segments.cs)), - &base_hva); + if (v3_gpa_to_hva(core, + get_addr_linear(core, tr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } else if (core->mem_mode == VIRTUAL_MEM) { - v3_gva_to_hva(core, - get_addr_linear(core, tr_base, &(core->segments.cs)), - &base_hva); + if (v3_gva_to_hva(core, + get_addr_linear(core, tr_base, &(core->segments.cs)), + &base_hva)) { + PrintError(core->vm_info, core, "Cannot translate address\n"); + return; + } } // SANITY CHECK