summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell2022-02-08 21:08:53 +0100
committerPeter Maydell2022-02-21 14:30:20 +0100
commitf2241d16eaa142b4092b11ace48f2a0472bf4ad6 (patch)
treec9054274241f849364296f27cc04578bb22fd7a6
parentinclude: Move qemu_madvise() and related #defines to new qemu/madvise.h (diff)
downloadqemu-f2241d16eaa142b4092b11ace48f2a0472bf4ad6.tar.gz
qemu-f2241d16eaa142b4092b11ace48f2a0472bf4ad6.tar.xz
qemu-f2241d16eaa142b4092b11ace48f2a0472bf4ad6.zip
include: Move qemu_mprotect_*() to new qemu/mprotect.h
The qemu_mprotect_*() family of functions are used in very few files; move them from osdep.h to a new qemu/mprotect.h. 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: 20220208200856.3558249-3-peter.maydell@linaro.org
-rw-r--r--include/qemu/mprotect.h14
-rw-r--r--include/qemu/osdep.h4
-rw-r--r--tcg/region.c1
-rw-r--r--util/osdep.c1
4 files changed, 16 insertions, 4 deletions
diff --git a/include/qemu/mprotect.h b/include/qemu/mprotect.h
new file mode 100644
index 0000000000..1e83d1433e
--- /dev/null
+++ b/include/qemu/mprotect.h
@@ -0,0 +1,14 @@
+/*
+ * QEMU mprotect functions
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef QEMU_MPROTECT_H
+#define QEMU_MPROTECT_H
+
+int qemu_mprotect_rw(void *addr, size_t size);
+int qemu_mprotect_rwx(void *addr, size_t size);
+int qemu_mprotect_none(void *addr, size_t size);
+
+#endif
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 5ebd737aeb..ca00899bbd 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -496,10 +496,6 @@ void sigaction_invoke(struct sigaction *action,
struct qemu_signalfd_siginfo *info);
#endif
-int qemu_mprotect_rw(void *addr, size_t size);
-int qemu_mprotect_rwx(void *addr, size_t size);
-int qemu_mprotect_none(void *addr, size_t size);
-
/*
* Don't introduce new usage of this function, prefer the following
* qemu_open/qemu_create that take an "Error **errp"
diff --git a/tcg/region.c b/tcg/region.c
index c46021d160..7b4e65a52e 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/madvise.h"
+#include "qemu/mprotect.h"
#include "qapi/error.h"
#include "exec/exec-all.h"
#include "tcg/tcg.h"
diff --git a/util/osdep.c b/util/osdep.c
index 8c5cd6e431..5181f86b82 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -39,6 +39,7 @@ extern int madvise(char *, size_t, int);
#include "qemu/sockets.h"
#include "qemu/error-report.h"
#include "qemu/madvise.h"
+#include "qemu/mprotect.h"
#include "monitor/monitor.h"
static bool fips_enabled = false;