| Message ID | 20230818175736.144194-4-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | bsd-user: image_info cleanups | expand |
On Fri, Aug 18, 2023 at 11:57 AM Richard Henderson < richard.henderson@linaro.org> wrote: > This has the same value is image_info.brk, which is also logged, > and is otherwise unused. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Reviewed-by: Warner Losh <imp@bsdimp.com> Same comments as 1/3. Forgot on 1/3 to mention I'm planning on doing a pull request right after the release (subject to our release engineer's ok) and can include this there. Warner > --- > bsd-user/qemu.h | 1 - > bsd-user/elfload.c | 2 +- > bsd-user/main.c | 2 -- > 3 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h > index 898fe3e8b3..61501c321b 100644 > --- a/bsd-user/qemu.h > +++ b/bsd-user/qemu.h > @@ -50,7 +50,6 @@ struct image_info { > abi_ulong end_code; > abi_ulong start_data; > abi_ulong end_data; > - abi_ulong start_brk; > abi_ulong brk; > abi_ulong rss; > abi_ulong start_stack; > diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c > index 2d39e59258..baf2f63d2f 100644 > --- a/bsd-user/elfload.c > +++ b/bsd-user/elfload.c > @@ -811,7 +811,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct > target_pt_regs *regs, > bprm->stringp, &elf_ex, load_addr, > et_dyn_addr, interp_load_addr, > info); > info->load_addr = reloc_func_desc; > - info->start_brk = info->brk = elf_brk; > + info->brk = elf_brk; > info->start_stack = bprm->p; > info->load_bias = 0; > > diff --git a/bsd-user/main.c b/bsd-user/main.c > index 381bb18df8..f913cb55a7 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -553,8 +553,6 @@ int main(int argc, char **argv) > fprintf(f, "page layout changed following binary load\n"); > page_dump(f); > > - fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n", > - info->start_brk); > fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n", > info->end_code); > fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n", > -- > 2.34.1 > >
On 8/18/23 11:22, Warner Losh wrote: > Forgot on 1/3 to mention I'm planning on doing a pull request right after the > release (subject to our release engineer's ok) and can include this there. Excellent, thanks. r~
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 898fe3e8b3..61501c321b 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -50,7 +50,6 @@ struct image_info { abi_ulong end_code; abi_ulong start_data; abi_ulong end_data; - abi_ulong start_brk; abi_ulong brk; abi_ulong rss; abi_ulong start_stack; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 2d39e59258..baf2f63d2f 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -811,7 +811,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, bprm->stringp, &elf_ex, load_addr, et_dyn_addr, interp_load_addr, info); info->load_addr = reloc_func_desc; - info->start_brk = info->brk = elf_brk; + info->brk = elf_brk; info->start_stack = bprm->p; info->load_bias = 0; diff --git a/bsd-user/main.c b/bsd-user/main.c index 381bb18df8..f913cb55a7 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -553,8 +553,6 @@ int main(int argc, char **argv) fprintf(f, "page layout changed following binary load\n"); page_dump(f); - fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n", - info->start_brk); fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n",
This has the same value is image_info.brk, which is also logged, and is otherwise unused. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- bsd-user/qemu.h | 1 - bsd-user/elfload.c | 2 +- bsd-user/main.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-)