qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: kevans@freebsd.org,
	Richard Henderson <richard.henderson@linaro.org>,
	Warner Losh <imp@bsdimp.com>
Subject: [PULL 20/20] bsd-user: rename linux_binprm to bsd_binprm
Date: Wed, 12 May 2021 11:17:20 -0600	[thread overview]
Message-ID: <20210512171720.46744-21-imp@bsdimp.com> (raw)
In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com>

Rename linux_binprm to bsd_binprm to reflect that we're loading BSD binaries,
not ELF ones.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 bsd-user/bsdload.c | 4 ++--
 bsd-user/elfload.c | 4 ++--
 bsd-user/qemu.h    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
index e1ed3b7b60..8d83f21eda 100644
--- a/bsd-user/bsdload.c
+++ b/bsd-user/bsdload.c
@@ -32,7 +32,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;
@@ -127,7 +127,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 3c9d8c2845..6edceb3ea6 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -662,7 +662,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;
@@ -1143,7 +1143,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/qemu.h b/bsd-user/qemu.h
index eb66d15df7..c02e8a5ca1 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -115,7 +115,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;
@@ -133,9 +133,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.22.1



  parent reply	other threads:[~2021-05-12 17:35 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-12 17:17 [PULL 00/20] bsd-user style tweaks and start cleanup Warner Losh
2021-05-12 17:17 ` [PULL 01/20] bsd-user: whitespace changes Warner Losh
2021-05-12 17:17 ` [PULL 02/20] bsd-user: style tweak: use C not C++ comments Warner Losh
2021-05-12 17:17 ` [PULL 03/20] bsd-user: style tweak: Remove #if 0'd code Warner Losh
2021-05-12 17:17 ` [PULL 04/20] bsd-user: style tweak: Use preferred block comments Warner Losh
2021-05-12 17:17 ` [PULL 05/20] bsd-user: Remove commented out code Warner Losh
2021-05-12 17:17 ` [PULL 06/20] bsd-user: style tweak: move extern to header file Warner Losh
2021-05-12 17:17 ` [PULL 07/20] bsd-user: style tweak: remove spacing after '*' and add after } Warner Losh
2021-05-12 17:17 ` [PULL 08/20] bsd-user: style tweak: Use preferred block comments Warner Losh
2021-05-12 17:17 ` [PULL 09/20] bsd-user: style tweak: don't assign in if statements Warner Losh
2021-05-12 17:17 ` [PULL 10/20] bsd-user: style tweak: use {} for all if statements, format else correctly Warner Losh
2021-05-12 17:17 ` [PULL 11/20] bsd-user: style tweak: use {} consistently in for / if / else statements Warner Losh
2021-05-12 17:17 ` [PULL 12/20] bsd-user: use qemu_strtoul in preference to strtol Warner Losh
2021-05-12 17:17 ` [PULL 13/20] bsd-user: whitespace changes Warner Losh
2021-05-12 17:17 ` [PULL 14/20] bsd-user: style tweak: keyword space ( Warner Losh
2021-05-12 17:17 ` [PULL 15/20] " Warner Losh
2021-05-12 17:17 ` [PULL 16/20] bsd-user: style tweak: Remove #if 0'd code Warner Losh
2021-05-12 17:17 ` [PULL 17/20] bsd-user: style tweak: keyword space ( Warner Losh
2021-05-12 17:17 ` [PULL 18/20] bsd-user: remove target_signal.h, it's unused Warner Losh
2021-05-12 17:17 ` [PULL 19/20] bsd-user: Stop building the sparc targets Warner Losh
2021-05-12 17:17 ` Warner Losh [this message]
2021-05-12 17:45 ` [PULL 00/20] bsd-user style tweaks and start cleanup no-reply
2021-05-20 17:41 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210512171720.46744-21-imp@bsdimp.com \
    --to=imp@bsdimp.com \
    --cc=kevans@freebsd.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).