Re: [PATCH for-6.2 05/10] linux-user: Split mmap prototypes into user-mmap.h

[Peter Maydell]

On Sun, 18 Jul 2021 at 00:21, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> Split out the mmap prototypes into a new header user-mmap.h
> which we only include where required.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  linux-user/qemu.h          | 20 --------------------
>  linux-user/user-mmap.h     | 34 ++++++++++++++++++++++++++++++++++
>  linux-user/elfload.c       |  1 +
>  linux-user/flatload.c      |  1 +
>  linux-user/i386/cpu_loop.c |  1 +
>  linux-user/main.c          |  1 +
>  linux-user/mmap.c          |  1 +
>  linux-user/syscall.c       |  1 +
>  8 files changed, 40 insertions(+), 20 deletions(-)
>  create mode 100644 linux-user/user-mmap.h
>
> diff --git a/linux-user/qemu.h b/linux-user/qemu.h
> index 9e700d3af18..0cb79990579 100644
> --- a/linux-user/qemu.h
> +++ b/linux-user/qemu.h
> @@ -201,12 +201,6 @@ extern IOCTLEntry ioctl_entries[];
>   */
>  int info_is_fdpic(struct image_info *info);
>
> -uint32_t get_elf_eflags(int fd);
> -int load_elf_binary(struct linux_binprm *bprm, struct image_info *info);
> -int load_flt_binary(struct linux_binprm *bprm, struct image_info *info);
> -
> -abi_long memcpy_to_target(abi_ulong dest, const void *src,
> -                          unsigned long len);
>  void target_set_brk(abi_ulong new_brk);
>  abi_long do_brk(abi_ulong new_brk);
>  void syscall_init(void);

Oops, this hunk should be in the previous patch (where these
were moved to loader.h).

> --- /dev/null
> +++ b/linux-user/user-mmap.h
> @@ -0,0 +1,34 @@
> +/*
> + * loader.h: prototypes for linux-user guest binary loader

...and this should say "user-mmap.h:".

> + *
> + *  This program is free software; you can redistribute it and/or modify
> + *  it under the terms of the GNU General Public License as published by
> + *  the Free Software Foundation; either version 2 of the License, or
> + *  (at your option) any later version.
> + *
> + *  This program is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *  GNU General Public License for more details.
> + *
> + *  You should have received a copy of the GNU General Public License
> + *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +

-- PMM