From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxmYh-0003qU-Ay for qemu-devel@nongnu.org; Thu, 19 Jun 2014 20:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxmYY-0007R6-2a for qemu-devel@nongnu.org; Thu, 19 Jun 2014 20:19:59 -0400 Received: from ignoranthack.me ([199.102.79.106]:60035 helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxmYX-0007Qk-S5 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 20:19:50 -0400 From: Sean Bruno Date: Thu, 19 Jun 2014 17:19:47 -0700 Message-Id: <1403223588-58739-4-git-send-email-sbruno@freebsd.org> In-Reply-To: <1403223588-58739-1-git-send-email-sbruno@freebsd.org> References: <1403223588-58739-1-git-send-email-sbruno@freebsd.org> Subject: [Qemu-devel] [PATCH 3/4] bsd-user: Rename linux_binprm to bsd_binprm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sean Bruno These too similar data structures will be diverging in future updates from my trees. Rename now. Signed-off-by: Sean Bruno --- bsd-user/bsdload.c | 4 ++-- bsd-user/elfload.c | 4 ++-- bsd-user/main.c | 2 +- bsd-user/qemu.h | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index 2abc713..e59b03d 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -53,7 +53,7 @@ static int count(char ** vec) return(i); } -static int prepare_binprm(struct linux_binprm *bprm) +static int prepare_binprm(struct bsd_binprm *bprm) { struct stat st; int mode; @@ -157,7 +157,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(const char * filename, char ** argv, char ** envp, struct target_pt_regs * regs, struct image_info *infop) { - struct linux_binprm bprm; + struct bsd_binprm bprm; int retval; int i; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index ccf72d1..c2e2daa 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -665,7 +665,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page, return p; } -static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, +static abi_ulong setup_arg_pages(abi_ulong p, struct bsd_binprm *bprm, struct image_info *info) { abi_ulong stack_base, size, error; @@ -1147,7 +1147,7 @@ static void load_symbols(struct elfhdr *hdr, int fd) syminfos = s; } -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, +int load_elf_binary(struct bsd_binprm * bprm, struct target_pt_regs * regs, struct image_info * info) { struct elfhdr elf_ex; diff --git a/bsd-user/main.c b/bsd-user/main.c index 9c5711d..0ba5955 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -328,7 +328,7 @@ int main(int argc, char **argv) const char *log_mask = NULL; struct target_pt_regs regs1, *regs = ®s1; struct image_info info1, *info = &info1; - struct linux_binprm bprm; + struct bsd_binprm bprm; TaskState ts1, *ts = &ts1; CPUArchState *env; CPUState *cpu; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 7521ebe..c70602e 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -91,7 +91,7 @@ typedef struct TaskState { struct TaskState *next; int used; /* non zero if used */ struct image_info *info; - struct linux_binprm *bprm; + struct bsd_binprm *bprm; struct emulated_sigtable sigtab[TARGET_NSIG]; struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */ @@ -120,7 +120,7 @@ extern unsigned long mmap_min_addr; * This structure is used to hold the arguments that are * used when loading binaries. */ -struct linux_binprm { +struct bsd_binprm { char buf[128]; void *page[MAX_ARG_PAGES]; abi_ulong p; @@ -138,9 +138,9 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(const char * filename, char ** argv, char ** envp, struct target_pt_regs * regs, struct image_info *infop); -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, +int load_elf_binary(struct bsd_binprm * bprm, struct target_pt_regs * regs, struct image_info * info); -int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, +int load_flt_binary(struct bsd_binprm * bprm, struct target_pt_regs * regs, struct image_info * info); abi_long memcpy_to_target(abi_ulong dest, const void *src, -- 2.0.0