Skip to content

Commit

Permalink
contrib/elf2dmp: Fix error reporting style in addrspace.c
Browse files Browse the repository at this point in the history 
include/qapi/error.h says:
> We recommend
> * bool-valued functions return true on success / false on failure,
> ...

Signed-off-by: Akihiko Odaki <[email protected]>
Tested-by: Viktor Prutyanov <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-id: [email protected]
Signed-off-by: Peter Maydell <[email protected]>
  • Loading branch information
@akihikodaki @pm215
akihikodaki authored and pm215 committed Mar 11, 2024
1 parent 262a0ff commit a15f974
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 31 deletions.
8 changes: 4 additions & 4 deletions contrib/elf2dmp/addrspace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ void *va_space_resolve(struct va_space *vs, uint64_t va)
return pa_space_resolve(vs->ps, pa);
}

int va_space_rw(struct va_space *vs, uint64_t addr,
void *buf, size_t size, int is_write)
bool va_space_rw(struct va_space *vs, uint64_t addr,
void *buf, size_t size, int is_write)
{
while (size) {
uint64_t page = addr & ELF2DMP_PFN_MASK;
Expand All @@ -238,7 +238,7 @@ int va_space_rw(struct va_space *vs, uint64_t addr,

ptr = va_space_resolve(vs, addr);
if (!ptr) {
return 1;
return false;
}

if (is_write) {
Expand All @@ -252,5 +252,5 @@ int va_space_rw(struct va_space *vs, uint64_t addr,
addr += s;
}

return 0;
return true;
}
4 changes: 2 additions & 2 deletions contrib/elf2dmp/addrspace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void pa_space_destroy(struct pa_space *ps);
void va_space_create(struct va_space *vs, struct pa_space *ps, uint64_t dtb);
void va_space_set_dtb(struct va_space *vs, uint64_t dtb);
void *va_space_resolve(struct va_space *vs, uint64_t va);
int va_space_rw(struct va_space *vs, uint64_t addr,
void *buf, size_t size, int is_write);
bool va_space_rw(struct va_space *vs, uint64_t addr,
void *buf, size_t size, int is_write);

#endif /* ADDRSPACE_H */
47 changes: 22 additions & 25 deletions contrib/elf2dmp/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ static KDDEBUGGER_DATA64 *get_kdbg(uint64_t KernBase, struct pdb_reader *pdb,
bool decode = false;
uint64_t kwn, kwa, KdpDataBlockEncoded;

if (va_space_rw(vs,
KdDebuggerDataBlock + offsetof(KDDEBUGGER_DATA64, Header),
&kdbg_hdr, sizeof(kdbg_hdr), 0)) {
if (!va_space_rw(vs,
KdDebuggerDataBlock + offsetof(KDDEBUGGER_DATA64, Header),
&kdbg_hdr, sizeof(kdbg_hdr), 0)) {
eprintf("Failed to extract KDBG header\n");
return NULL;
}
Expand All @@ -97,8 +97,8 @@ static KDDEBUGGER_DATA64 *get_kdbg(uint64_t KernBase, struct pdb_reader *pdb,
return NULL;
}

if (va_space_rw(vs, KiWaitNever, &kwn, sizeof(kwn), 0) ||
va_space_rw(vs, KiWaitAlways, &kwa, sizeof(kwa), 0)) {
if (!va_space_rw(vs, KiWaitNever, &kwn, sizeof(kwn), 0) ||
!va_space_rw(vs, KiWaitAlways, &kwa, sizeof(kwa), 0)) {
return NULL;
}

Expand All @@ -122,7 +122,7 @@ static KDDEBUGGER_DATA64 *get_kdbg(uint64_t KernBase, struct pdb_reader *pdb,

kdbg = g_malloc(kdbg_hdr.Size);

if (va_space_rw(vs, KdDebuggerDataBlock, kdbg, kdbg_hdr.Size, 0)) {
if (!va_space_rw(vs, KdDebuggerDataBlock, kdbg, kdbg_hdr.Size, 0)) {
eprintf("Failed to extract entire KDBG\n");
g_free(kdbg);
return NULL;
Expand Down Expand Up @@ -286,7 +286,7 @@ static int fill_header(WinDumpHeader64 *hdr, struct pa_space *ps,
return 1;
}

if (va_space_rw(vs, KdVersionBlock, &kvb, sizeof(kvb), 0)) {
if (!va_space_rw(vs, KdVersionBlock, &kvb, sizeof(kvb), 0)) {
eprintf("Failed to extract KdVersionBlock\n");
return 1;
}
Expand Down Expand Up @@ -352,8 +352,8 @@ static void fill_context(KDDEBUGGER_DATA64 *kdbg,
WinContext64 ctx;
QEMUCPUState *s = qe->state[i];

if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i,
&Prcb, sizeof(Prcb), 0)) {
if (!va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i,
&Prcb, sizeof(Prcb), 0)) {
eprintf("Failed to read CPU #%d PRCB location\n", i);
continue;
}
Expand All @@ -363,16 +363,16 @@ static void fill_context(KDDEBUGGER_DATA64 *kdbg,
continue;
}

if (va_space_rw(vs, Prcb + kdbg->OffsetPrcbContext,
&Context, sizeof(Context), 0)) {
if (!va_space_rw(vs, Prcb + kdbg->OffsetPrcbContext,
&Context, sizeof(Context), 0)) {
eprintf("Failed to read CPU #%d ContextFrame location\n", i);
continue;
}

printf("Filling context for CPU #%d...\n", i);
win_context_init_from_qemu_cpu_state(&ctx, s);

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);
continue;
}
Expand All @@ -396,8 +396,8 @@ static int pe_get_data_dir_entry(uint64_t base, void *start_addr, int idx,
return 1;
}

if (va_space_rw(vs, base + dos_hdr->e_lfanew,
&nt_hdrs, sizeof(nt_hdrs), 0)) {
if (!va_space_rw(vs, base + dos_hdr->e_lfanew,
&nt_hdrs, sizeof(nt_hdrs), 0)) {
return 1;
}

Expand All @@ -406,9 +406,7 @@ static int pe_get_data_dir_entry(uint64_t base, void *start_addr, int idx,
return 1;
}

if (va_space_rw(vs,
base + data_dir[idx].VirtualAddress,
entry, size, 0)) {
if (!va_space_rw(vs, base + data_dir[idx].VirtualAddress, entry, size, 0)) {
return 1;
}

Expand Down Expand Up @@ -470,9 +468,8 @@ static bool pe_check_pdb_name(uint64_t base, void *start_addr,
return false;
}

if (va_space_rw(vs,
base + debug_dir.AddressOfRawData,
rsds, sizeof(*rsds), 0)) {
if (!va_space_rw(vs, base + debug_dir.AddressOfRawData,
rsds, sizeof(*rsds), 0)) {
eprintf("Failed to resolve OMFSignatureRSDS\n");
return false;
}
Expand All @@ -488,9 +485,9 @@ static bool pe_check_pdb_name(uint64_t base, void *start_addr,
return false;
}

if (va_space_rw(vs, base + debug_dir.AddressOfRawData +
offsetof(OMFSignatureRSDS, name), pdb_name, sizeof(PDB_NAME),
0)) {
if (!va_space_rw(vs, base + debug_dir.AddressOfRawData +
offsetof(OMFSignatureRSDS, name),
pdb_name, sizeof(PDB_NAME), 0)) {
eprintf("Failed to resolve PDB name\n");
return false;
}
Expand Down Expand Up @@ -556,8 +553,8 @@ int main(int argc, char *argv[])

printf("CPU #0 IDT is at 0x%016"PRIx64"\n", state->idt.base);

if (va_space_rw(&vs, state->idt.base,
&first_idt_desc, sizeof(first_idt_desc), 0)) {
if (!va_space_rw(&vs, state->idt.base,
&first_idt_desc, sizeof(first_idt_desc), 0)) {
eprintf("Failed to get CPU #0 IDT[0]\n");
goto out_ps;
}
Expand Down

0 comments on commit a15f974

Please sign in to comment.