From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1d5A-0007hu-9n for qemu-devel@nongnu.org; Fri, 10 Jan 2014 09:29:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1d54-00075B-Jh for qemu-devel@nongnu.org; Fri, 10 Jan 2014 09:29:08 -0500 Received: from afflict.kos.to ([92.243.29.197]:42831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1d54-00074c-78 for qemu-devel@nongnu.org; Fri, 10 Jan 2014 09:29:02 -0500 Received: from kos.to (91-157-196-38.elisa-laajakaista.fi [91.157.196.38]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 059FE2655A for ; Fri, 10 Jan 2014 15:28:59 +0100 (CET) From: riku.voipio@linaro.org Date: Fri, 10 Jan 2014 16:28:57 +0200 Message-Id: <1389364137-23287-3-git-send-email-riku.voipio@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/2] linux-user: Remove regs parameter of load_elf_binary and load_flt_binary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Will Newton , anthony@codemonkey.ws From: Will Newton The regs parameter is not used anywhere, so remove it. Signed-off-by: Will Newton Reviewed-by: Erik de Castro Lopo Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Riku Voipio --- linux-user/elfload.c | 3 +-- linux-user/flatload.c | 3 +-- linux-user/linuxload.c | 4 ++-- linux-user/qemu.h | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8dd424d..5902f16 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1998,8 +1998,7 @@ give_up: free(syms); } =20 -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * = regs, - struct image_info * info) +int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) { struct image_info interp_info; struct elfhdr elf_ex; diff --git a/linux-user/flatload.c b/linux-user/flatload.c index ceb89bb..566a7a8 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -704,8 +704,7 @@ static int load_flat_shared_library(int id, struct li= b_info *libs) =20 #endif /* CONFIG_BINFMT_SHARED_FLAT */ =20 -int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * = regs, - struct image_info * info) +int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) { struct lib_info libinfo[MAX_SHARED_LIBS]; abi_ulong p =3D bprm->p; diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index a1fe5ed..f2997c2 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -154,13 +154,13 @@ int loader_exec(int fdexec, const char *filename, c= har **argv, char **envp, && bprm->buf[1] =3D=3D 'E' && bprm->buf[2] =3D=3D 'L' && bprm->buf[3] =3D=3D 'F') { - retval =3D load_elf_binary(bprm, regs, infop); + retval =3D load_elf_binary(bprm, infop); #if defined(TARGET_HAS_BFLT) } else if (bprm->buf[0] =3D=3D 'b' && bprm->buf[1] =3D=3D 'F' && bprm->buf[2] =3D=3D 'L' && bprm->buf[3] =3D=3D 'T') { - retval =3D load_flt_binary(bprm,regs,infop); + retval =3D load_flt_binary(bprm, infop); #endif } else { return -ENOEXEC; diff --git a/linux-user/qemu.h b/linux-user/qemu.h index e2717e0..c2f74f3 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -178,10 +178,8 @@ int loader_exec(int fdexec, const char *filename, ch= ar **argv, char **envp, struct target_pt_regs * regs, struct image_info *infop, struct linux_binprm *); =20 -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * = regs, - struct image_info * info); -int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * = regs, - struct image_info * info); +int load_elf_binary(struct linux_binprm *bprm, struct image_info *info); +int load_flt_binary(struct linux_binprm *bprm, struct image_info *info); =20 abi_long memcpy_to_target(abi_ulong dest, const void *src, unsigned long len); --=20 1.8.1.2