ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

contrib/elf2dmp: Change pa_space_create() signature 

pa_space_create() used to return an integer to propagate error, but
it never fails so let it return void.

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

4
contrib/elf2dmp/addrspace.c
View File

@ -57,7 +57,7 @@ static void pa_block_align(struct pa_block *b)
b->paddr += low_align; b->paddr += low_align;
} }
int pa_space_create(struct pa_space *ps, QEMU_Elf *qemu_elf) void pa_space_create(struct pa_space *ps, QEMU_Elf *qemu_elf)
{ {
Elf64_Half phdr_nr = elf_getphdrnum(qemu_elf->map); Elf64_Half phdr_nr = elf_getphdrnum(qemu_elf->map);
Elf64_Phdr *phdr = elf64_getphdr(qemu_elf->map); Elf64_Phdr *phdr = elf64_getphdr(qemu_elf->map);
@ -87,8 +87,6 @@ int pa_space_create(struct pa_space *ps, QEMU_Elf *qemu_elf)
} }
ps->block_nr = block_i; ps->block_nr = block_i;
return 0;
} }
void pa_space_destroy(struct pa_space *ps) void pa_space_destroy(struct pa_space *ps)

2
contrib/elf2dmp/addrspace.h
View File

@ -33,7 +33,7 @@ struct va_space {
struct pa_space *ps; struct pa_space *ps;
}; };
int pa_space_create(struct pa_space *ps, QEMU_Elf *qemu_elf); void pa_space_create(struct pa_space *ps, QEMU_Elf *qemu_elf);
void pa_space_destroy(struct pa_space *ps); 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_create(struct va_space *vs, struct pa_space *ps, uint64_t dtb);

5
contrib/elf2dmp/main.c
View File

@ -543,10 +543,7 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
if (pa_space_create(&ps, &qemu_elf)) { pa_space_create(&ps, &qemu_elf);
eprintf("Failed to initialize physical address space\n");
goto out_elf;
}
state = qemu_elf.state[0]; state = qemu_elf.state[0];
printf("CPU #0 CR3 is 0x%016"PRIx64"\n", state->cr[3]); printf("CPU #0 CR3 is 0x%016"PRIx64"\n", state->cr[3]);