[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/20] contrib/elf2dmp: Continue even contexts are lacking
From: |
Peter Maydell |
Subject: |
[PULL 04/20] contrib/elf2dmp: Continue even contexts are lacking |
Date: |
Mon, 11 Mar 2024 19:12:25 +0000 |
From: Akihiko Odaki <akihiko.odaki@daynix.com>
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>
---
contrib/elf2dmp/main.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c
index 9b278f392e3..86e709e6da3 100644
--- a/contrib/elf2dmp/main.c
+++ b/contrib/elf2dmp/main.c
@@ -336,8 +336,13 @@ static int fill_header(WinDumpHeader64 *hdr, struct
pa_space *ps,
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;
@@ -350,7 +355,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i,
&Prcb, sizeof(Prcb), 0)) {
eprintf("Failed to read CPU #%d PRCB location\n", i);
- return 1;
+ continue;
}
if (!Prcb) {
@@ -361,7 +366,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
if (va_space_rw(vs, Prcb + kdbg->OffsetPrcbContext,
&Context, sizeof(Context), 0)) {
eprintf("Failed to read CPU #%d ContextFrame location\n", i);
- return 1;
+ continue;
}
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)) {
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,
@@ -619,9 +622,7 @@ int main(int argc, char *argv[])
goto out_kdbg;
}
- if (fill_context(kdbg, &vs, &qemu_elf)) {
- goto out_kdbg;
- }
+ fill_context(kdbg, &vs, &qemu_elf);
if (write_dump(&ps, &header, argv[2])) {
eprintf("Failed to save dump\n");
--
2.34.1
- [PULL 00/20] target-arm queue, (continued)
- [PULL 00/20] target-arm queue, Peter Maydell, 2024/03/11
- [PULL 03/20] contrib/elf2dmp: Assume error by default, Peter Maydell, 2024/03/11
- [PULL 08/20] contrib/elf2dmp: Fix error reporting style in pdb.c, Peter Maydell, 2024/03/11
- [PULL 15/20] contrib/elf2dmp: Use rol64() to decode, Peter Maydell, 2024/03/11
- [PULL 12/20] contrib/elf2dmp: Always destroy PA space, Peter Maydell, 2024/03/11
- [PULL 18/20] contrib/elf2dmp: Clamp QEMU note to file size, Peter Maydell, 2024/03/11
- [PULL 11/20] contrib/elf2dmp: Always check for PA resolution failure, Peter Maydell, 2024/03/11
- [PULL 20/20] docs: update copyright date to the year 2024, Peter Maydell, 2024/03/11
- [PULL 01/20] hw/arm: Deprecate various old Arm machine types, Peter Maydell, 2024/03/11
- [PULL 07/20] contrib/elf2dmp: Fix error reporting style in download.c, Peter Maydell, 2024/03/11
- [PULL 04/20] contrib/elf2dmp: Continue even contexts are lacking,
Peter Maydell <=
- [PULL 02/20] contrib/elf2dmp: Remove unnecessary err flags, Peter Maydell, 2024/03/11
- [PULL 14/20] contrib/elf2dmp: Use lduw_le_p() to read PDB, Peter Maydell, 2024/03/11
- [PULL 13/20] contrib/elf2dmp: Ensure segment fits in file, Peter Maydell, 2024/03/11
- [PULL 09/20] contrib/elf2dmp: Fix error reporting style in qemu_elf.c, Peter Maydell, 2024/03/11
- [PULL 05/20] contrib/elf2dmp: Change pa_space_create() signature, Peter Maydell, 2024/03/11
- [PULL 06/20] contrib/elf2dmp: Fix error reporting style in addrspace.c, Peter Maydell, 2024/03/11
- [PULL 17/20] contrib/elf2dmp: Use GPtrArray, Peter Maydell, 2024/03/11
- [PULL 10/20] contrib/elf2dmp: Fix error reporting style in main.c, Peter Maydell, 2024/03/11
- [PULL 16/20] MAINTAINERS: Add Akihiko Odaki as a elf2dmp reviewer, Peter Maydell, 2024/03/11
- [PULL 19/20] contrib/elf2dmp: Ensure phdrs fit in file, Peter Maydell, 2024/03/11