[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/10] linux-user: Split mmap prototypes into user-mmap.h
From: |
Laurent Vivier |
Subject: |
[PULL 05/10] linux-user: Split mmap prototypes into user-mmap.h |
Date: |
Thu, 16 Sep 2021 17:12:32 +0200 |
From: Peter Maydell <peter.maydell@linaro.org>
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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-6-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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/qemu.h | 14 --------------
linux-user/syscall.c | 1 +
linux-user/user-mmap.h | 34 ++++++++++++++++++++++++++++++++++
8 files changed, 40 insertions(+), 14 deletions(-)
create mode 100644 linux-user/user-mmap.h
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 6244fcd05ce4..c291f3cee09f 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 7484a4a35432..99550061db8d 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 ee2e139a0634..fcc410a426ae 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 "signal-common.h"
+#include "user-mmap.h"
/***********************************************************/
/* CPUX86 core interface */
diff --git a/linux-user/main.c b/linux-user/main.c
index 67c5a87ffadd..a76aec733689 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -51,6 +51,7 @@
#include "fd-trans.h"
#include "signal-common.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 0e103859fed8..4b182444bbdc 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/qemu.h b/linux-user/qemu.h
index 02c4778c9704..0cb799905796 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -389,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/syscall.c b/linux-user/syscall.c
index b1cd7410d8bb..b6c8406e1dc0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -130,6 +130,7 @@
#include "strace.h"
#include "signal-common.h"
#include "loader.h"
+#include "user-mmap.h"
#include "qemu/guest-random.h"
#include "qemu/selfmap.h"
#include "user/syscall-trace.h"
diff --git a/linux-user/user-mmap.h b/linux-user/user-mmap.h
new file mode 100644
index 000000000000..d1dec99c0249
--- /dev/null
+++ b/linux-user/user-mmap.h
@@ -0,0 +1,34 @@
+/*
+ * user-mmap.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 */
--
2.31.1
- [PULL 00/10] Linux user for 6.2 patches, Laurent Vivier, 2021/09/16
- [PULL 03/10] linux-user: Split signal-related prototypes into signal-common.h, Laurent Vivier, 2021/09/16
- [PULL 07/10] linux-user: Split linux-user internals out of qemu.h, Laurent Vivier, 2021/09/16
- [PULL 01/10] linux-user: Fix coding style nits in qemu.h, Laurent Vivier, 2021/09/16
- [PULL 04/10] linux-user: Split loader-related prototypes into loader.h, Laurent Vivier, 2021/09/16
- [PULL 06/10] linux-user: Split safe-syscall macro into its own header, Laurent Vivier, 2021/09/16
- [PULL 02/10] linux-user: Split strace prototypes into strace.h, Laurent Vivier, 2021/09/16
- [PULL 05/10] linux-user: Split mmap prototypes into user-mmap.h,
Laurent Vivier <=
- [PULL 09/10] linux-user: Drop unneeded includes from qemu.h, Laurent Vivier, 2021/09/16
- [PULL 10/10] linux-user: Check lock_user result for ip_mreq_source sockopts, Laurent Vivier, 2021/09/16
- [PULL 08/10] linux-user: Don't include gdbstub.h in qemu.h, Laurent Vivier, 2021/09/16
- Re: [PULL 00/10] Linux user for 6.2 patches, Peter Maydell, 2021/09/17