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

contrib/elf2dmp: Fix error reporting style in qemu_elf.c

Browse Source 
include/qapi/error.h says:
> We recommend
> * bool-valued functions return true on success / false on failure,
> ...

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

2
contrib/elf2dmp/main.c
View File

@ -535,7 +535,7 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
if (QEMU_Elf_init(&qemu_elf, argv[1])) { if (!QEMU_Elf_init(&qemu_elf, argv[1])) {
eprintf("Failed to initialize QEMU ELF dump\n"); eprintf("Failed to initialize QEMU ELF dump\n");
return 1; return 1;
} }

32
contrib/elf2dmp/qemu_elf.c
View File

@ -60,7 +60,7 @@ Elf64_Half elf_getphdrnum(void *map)
return ehdr->e_phnum; return ehdr->e_phnum;
} }
static int init_states(QEMU_Elf *qe) static bool init_states(QEMU_Elf *qe)
{ {
Elf64_Phdr *phdr = elf64_getphdr(qe->map); Elf64_Phdr *phdr = elf64_getphdr(qe->map);
Elf64_Nhdr *start = (void *)((uint8_t *)qe->map + phdr[0].p_offset); Elf64_Nhdr *start = (void *)((uint8_t *)qe->map + phdr[0].p_offset);
@ -70,7 +70,7 @@ static int init_states(QEMU_Elf *qe)
if (phdr[0].p_type != PT_NOTE) { if (phdr[0].p_type != PT_NOTE) {
eprintf("Failed to find PT_NOTE\n"); eprintf("Failed to find PT_NOTE\n");
return 1; return false;
} }
qe->has_kernel_gs_base = 1; qe->has_kernel_gs_base = 1;
@ -107,7 +107,7 @@ static int init_states(QEMU_Elf *qe)
qe->state_nr = cpu_nr; qe->state_nr = cpu_nr;
return 0; return true;
} }
static void exit_states(QEMU_Elf *qe) static void exit_states(QEMU_Elf *qe)
@ -162,7 +162,7 @@ static bool check_ehdr(QEMU_Elf *qe)
return true; return true;
} }
static int QEMU_Elf_map(QEMU_Elf *qe, const char *filename) static bool QEMU_Elf_map(QEMU_Elf *qe, const char *filename)
{ {
#ifdef CONFIG_LINUX #ifdef CONFIG_LINUX
struct stat st; struct stat st;
@ -173,13 +173,13 @@ static int QEMU_Elf_map(QEMU_Elf *qe, const char *filename)
fd = open(filename, O_RDONLY, 0); fd = open(filename, O_RDONLY, 0);
if (fd == -1) { if (fd == -1) {
eprintf("Failed to open ELF dump file \'%s\'\n", filename); eprintf("Failed to open ELF dump file \'%s\'\n", filename);
return 1; return false;
} }
if (fstat(fd, &st)) { if (fstat(fd, &st)) {
eprintf("Failed to get size of ELF dump file\n"); eprintf("Failed to get size of ELF dump file\n");
close(fd); close(fd);
return 1; return false;
} }
qe->size = st.st_size; qe->size = st.st_size;
@ -188,7 +188,7 @@ static int QEMU_Elf_map(QEMU_Elf *qe, const char *filename)
if (qe->map == MAP_FAILED) { if (qe->map == MAP_FAILED) {
eprintf("Failed to map ELF file\n"); eprintf("Failed to map ELF file\n");
close(fd); close(fd);
return 1; return false;
} }
close(fd); close(fd);
@ -201,14 +201,14 @@ static int QEMU_Elf_map(QEMU_Elf *qe, const char *filename)
if (gerr) { if (gerr) {
eprintf("Failed to map ELF dump file \'%s\'\n", filename); eprintf("Failed to map ELF dump file \'%s\'\n", filename);
g_error_free(gerr); g_error_free(gerr);
return 1; return false;
} }
qe->map = g_mapped_file_get_contents(qe->gmf); qe->map = g_mapped_file_get_contents(qe->gmf);
qe->size = g_mapped_file_get_length(qe->gmf); qe->size = g_mapped_file_get_length(qe->gmf);
#endif #endif
return 0; return true;
} }
static void QEMU_Elf_unmap(QEMU_Elf *qe) static void QEMU_Elf_unmap(QEMU_Elf *qe)
@ -220,25 +220,25 @@ static void QEMU_Elf_unmap(QEMU_Elf *qe)
#endif #endif
} }
int QEMU_Elf_init(QEMU_Elf *qe, const char *filename) bool QEMU_Elf_init(QEMU_Elf *qe, const char *filename)
{ {
if (QEMU_Elf_map(qe, filename)) { if (!QEMU_Elf_map(qe, filename)) {
return 1; return false;
} }
if (!check_ehdr(qe)) { if (!check_ehdr(qe)) {
eprintf("Input file has the wrong format\n"); eprintf("Input file has the wrong format\n");
QEMU_Elf_unmap(qe); QEMU_Elf_unmap(qe);
return 1; return false;
} }
if (init_states(qe)) { if (!init_states(qe)) {
eprintf("Failed to extract QEMU CPU states\n"); eprintf("Failed to extract QEMU CPU states\n");
QEMU_Elf_unmap(qe); QEMU_Elf_unmap(qe);
return 1; return false;
} }
return 0; return true;
} }
void QEMU_Elf_exit(QEMU_Elf *qe) void QEMU_Elf_exit(QEMU_Elf *qe)

2
contrib/elf2dmp/qemu_elf.h
View File

@ -42,7 +42,7 @@ typedef struct QEMU_Elf {
int has_kernel_gs_base; int has_kernel_gs_base;
} QEMU_Elf; } QEMU_Elf;
int QEMU_Elf_init(QEMU_Elf *qe, const char *filename); bool QEMU_Elf_init(QEMU_Elf *qe, const char *filename);
void QEMU_Elf_exit(QEMU_Elf *qe); void QEMU_Elf_exit(QEMU_Elf *qe);
Elf64_Phdr *elf64_getphdr(void *map); Elf64_Phdr *elf64_getphdr(void *map);