OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

contrib/elf2dmp: Continue even contexts are lacking

Browse Source 
Let fill_context() continue even if it fails to fill contexts of some
CPUs. A dump may still contain valuable information even if it lacks
contexts of some CPUs due to dump corruption or a failure before
starting CPUs.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Viktor Prutyanov <viktor.prutyanov@phystech.edu>
Message-id: 20240307-elf2dmp-v4-3-4f324ad4d99d@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Akihiko Odaki 2024-03-07 19:20:46 +09:00 committed by Peter Maydell
parent a4e58de146
commit 87157ef350
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/elf2dmp/main.c
View File

@ -336,8 +336,13 @@ static int fill_header(WinDumpHeader64 *hdr, struct pa_space *ps,
return 0; return 0;
} }
static int fill_context(KDDEBUGGER_DATA64 *kdbg, /*
struct va_space *vs, QEMU_Elf *qe) * fill_context() continues even if it fails to fill contexts of some CPUs.
* A dump may still contain valuable information even if it lacks contexts of
* some CPUs due to dump corruption or a failure before starting CPUs.
*/
static void fill_context(KDDEBUGGER_DATA64 *kdbg,
struct va_space *vs, QEMU_Elf *qe)
{ {
int i; int i;
@ -350,7 +355,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i, if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i,
&Prcb, sizeof(Prcb), 0)) { &Prcb, sizeof(Prcb), 0)) {
eprintf("Failed to read CPU #%d PRCB location\n", i); eprintf("Failed to read CPU #%d PRCB location\n", i);
return 1; continue;
} }
if (!Prcb) { if (!Prcb) {
@ -361,7 +366,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
if (va_space_rw(vs, Prcb + kdbg->OffsetPrcbContext, if (va_space_rw(vs, Prcb + kdbg->OffsetPrcbContext,
&Context, sizeof(Context), 0)) { &Context, sizeof(Context), 0)) {
eprintf("Failed to read CPU #%d ContextFrame location\n", i); eprintf("Failed to read CPU #%d ContextFrame location\n", i);
return 1; continue;
} }
printf("Filling context for CPU #%d...\n", i); printf("Filling context for CPU #%d...\n", i);
@ -369,11 +374,9 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
if (va_space_rw(vs, Context, &ctx, sizeof(ctx), 1)) { if (va_space_rw(vs, Context, &ctx, sizeof(ctx), 1)) {
eprintf("Failed to fill CPU #%d context\n", i); eprintf("Failed to fill CPU #%d context\n", i);
return 1; continue;
} }
} }
return 0;
} }
static int pe_get_data_dir_entry(uint64_t base, void *start_addr, int idx, static int pe_get_data_dir_entry(uint64_t base, void *start_addr, int idx,
@ -619,9 +622,7 @@ int main(int argc, char *argv[])
goto out_kdbg; goto out_kdbg;
} }
if (fill_context(kdbg, &vs, &qemu_elf)) { fill_context(kdbg, &vs, &qemu_elf);
goto out_kdbg;
}
if (write_dump(&ps, &header, argv[2])) { if (write_dump(&ps, &header, argv[2])) {
eprintf("Failed to save dump\n"); eprintf("Failed to save dump\n");