[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 05/10] linux-user: Split mmap prototypes into user-mmap.h
From: |
Peter Maydell |
Subject: |
[PATCH for-6.2 05/10] linux-user: Split mmap prototypes into user-mmap.h |
Date: |
Sun, 18 Jul 2021 00:20:58 +0100 |
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);
@@ -395,20 +389,6 @@ void sparc64_set_context(CPUSPARCState *env);
void sparc64_get_context(CPUSPARCState *env);
#endif
-/* mmap.c */
-int target_mprotect(abi_ulong start, abi_ulong len, int prot);
-abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
- int flags, int fd, abi_ulong offset);
-int target_munmap(abi_ulong start, abi_ulong len);
-abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
- abi_ulong new_size, unsigned long flags,
- abi_ulong new_addr);
-extern unsigned long last_brk;
-extern abi_ulong mmap_next_start;
-abi_ulong mmap_find_vma(abi_ulong, abi_ulong, abi_ulong);
-void mmap_fork_start(void);
-void mmap_fork_end(int child);
-
/* user access */
#define VERIFY_READ PAGE_READ
diff --git a/linux-user/user-mmap.h b/linux-user/user-mmap.h
new file mode 100644
index 00000000000..e94fbd10433
--- /dev/null
+++ b/linux-user/user-mmap.h
@@ -0,0 +1,34 @@
+/*
+ * loader.h: prototypes for linux-user guest binary loader
+ *
+ * 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/>.
+ */
+
+#ifndef LINUX_USER_USER_MMAP_H
+#define LINUX_USER_USER_MMAP_H
+
+int target_mprotect(abi_ulong start, abi_ulong len, int prot);
+abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
+ int flags, int fd, abi_ulong offset);
+int target_munmap(abi_ulong start, abi_ulong len);
+abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
+ abi_ulong new_size, unsigned long flags,
+ abi_ulong new_addr);
+extern unsigned long last_brk;
+extern abi_ulong mmap_next_start;
+abi_ulong mmap_find_vma(abi_ulong, abi_ulong, abi_ulong);
+void mmap_fork_start(void);
+void mmap_fork_end(int child);
+
+#endif /* LINUX_USER_USER_MMAP_H */
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index d56e00c18b4..f770de31672 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -7,6 +7,7 @@
#include "qemu.h"
#include "loader.h"
+#include "user-mmap.h"
#include "disas/disas.h"
#include "qemu/bitops.h"
#include "qemu/path.h"
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 7484a4a3543..99550061db8 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -37,6 +37,7 @@
#include "qemu.h"
#include "loader.h"
+#include "user-mmap.h"
#include "flat.h"
#include "target_flat.h"
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index db6dbf40cdc..fca0a75d8a1 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -22,6 +22,7 @@
#include "qemu.h"
#include "cpu_loop-common.h"
#include "sighandling.h"
+#include "user-mmap.h"
/***********************************************************/
/* CPUX86 core interface */
diff --git a/linux-user/main.c b/linux-user/main.c
index 4ec0e2ad55d..dfcdd80a563 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -51,6 +51,7 @@
#include "fd-trans.h"
#include "sighandling.h"
#include "loader.h"
+#include "user-mmap.h"
#ifndef AT_FLAGS_PRESERVE_ARGV0
#define AT_FLAGS_PRESERVE_ARGV0_BIT 0
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 0e103859fed..4b182444bbd 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -20,6 +20,7 @@
#include "trace.h"
#include "exec/log.h"
#include "qemu.h"
+#include "user-mmap.h"
static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
static __thread int mmap_lock_count;
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d6019b1c4c2..1dd285972f7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -130,6 +130,7 @@
#include "strace.h"
#include "sighandling.h"
#include "loader.h"
+#include "user-mmap.h"
#include "qemu/guest-random.h"
#include "qemu/selfmap.h"
#include "user/syscall-trace.h"
--
2.20.1
- [PATCH for-6.2 00/10] linux-user: split internals out of qemu.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 02/10] linux-user: Split strace prototypes into strace.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 01/10] linux-user: Fix coding style nits in qemu.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 03/10] linux-user: Split signal-related prototypes into sighandling.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 05/10] linux-user: Split mmap prototypes into user-mmap.h,
Peter Maydell <=
- [PATCH for-6.2 04/10] linux-user: Split loader-related prototypes into loader.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 06/10] linux-user: Split safe-syscall macro into its own header, Peter Maydell, 2021/07/17
- [PATCH for-6.2 08/10] linux-user: Don't include gdbstub.h in qemu.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 10/10] linux-user: Move DEBUG_REMAP undef to uaccess.c, Peter Maydell, 2021/07/17
- [PATCH for-6.2 07/10] linux-user: Split linux-user internals out of qemu.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 09/10] linux-user: Drop unneeded includes from qemu.h, Peter Maydell, 2021/07/17