common-user: Move selfmap from util
This interface is only used for user-only. It's more usefully placed within common-user than util. Temporarily add stub implementation for bsd-user. Reviewed-by: Helge Deller <deller@gmx.de> Reviewed-by: Warner Losh <imp@bsdimp.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Richard Henderson committed
May 30, 2026 at 12:20 UTC
544f4c5b68d5ec9d26f7ccceeff9766546e3b2bf
6 files changed
+8
-7
common-user/meson.build
+1
@@ -8,4 +8,5 @@ user_ss.add(files(
8
'mmap-min-addr.c',
9
'safe-syscall.S',
10
'safe-syscall-error.c',
11
+ 'selfmap.c',
12
))
common-user/selfmap.c
renamed
+5
-1
@@ -8,10 +8,11 @@
8
9
#include "qemu/osdep.h"
10
#include "qemu/cutils.h"
11
-#include "qemu/selfmap.h"
11
+#include "user/selfmap.h"
12
13
IntervalTreeRoot *read_self_maps(void)
14
{
15
+#ifdef __linux__
16
IntervalTreeRoot *root;
17
gchar *maps, **lines;
18
guint i, nlines;
@@ -80,6 +81,9 @@ IntervalTreeRoot *read_self_maps(void)
81
g_free(maps);
82
83
return root;
84
+#else
85
+ return NULL;
86
+#endif
87
}
88
89
/**
include/user/selfmap.h
renamed
linux-user/elfload.c
+1
-1
@@ -25,7 +25,7 @@
25
#include "qemu/queue.h"
26
#include "qemu/guest-random.h"
27
#include "qemu/units.h"
28
-#include "qemu/selfmap.h"
28
+#include "user/selfmap.h"
29
#include "qemu/lockable.h"
30
#include "qapi/error.h"
31
#include "qemu/error-report.h"
linux-user/syscall.c
+1
-1
@@ -141,7 +141,7 @@
141
#include "user/safe-syscall.h"
142
#include "user/signal.h"
143
#include "qemu/guest-random.h"
144
-#include "qemu/selfmap.h"
144
+#include "user/selfmap.h"
145
#include "special-errno.h"
146
#include "qapi/error.h"
147
#include "fd-trans.h"
util/meson.build
-4
@@ -67,10 +67,6 @@ util_ss.add(files('memalign.c'))
67
util_ss.add(files('interval-tree.c'))
68
util_ss.add(files('lockcnt.c'))
69
70
-if have_user
71
- util_ss.add(files('selfmap.c'))
72
-endif
73
-
70
if have_system
71
util_ss.add(files('crc-ccitt.c'))
72
util_ss.add(when: gio, if_true: files('dbus.c'))