aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2025-07-10 11:45:28 +0100
committerAlex Bennée <alex.bennee@linaro.org>2025-07-14 11:42:49 +0100
commitdcc83c3e41a89a1426fb56106c882479185f6383 (patch)
tree80707e06aa4888486c84af6f8e68ed6d33641a27
parent5a28fa5ba17254d0398a854657b47af3096bd86a (diff)
downloadqemu-dcc83c3e41a89a1426fb56106c882479185f6383.zip
qemu-dcc83c3e41a89a1426fb56106c882479185f6383.tar.gz
qemu-dcc83c3e41a89a1426fb56106c882479185f6383.tar.bz2
plugins: fix inclusion of user-mode APIs
In 903e870f24 (plugins/api: split out binary path/start/end/entry code) we didn't actually enable the building of the new plugin helper. However this was missed because only contrib plugins like drcov actually used the helpers. With that fixed we discover we also need some more includes to be able to extract the relevant data from TaskState. Fixes: 903e870f24 (plugins/api: split out binary path/start/end/entry code) Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3014 Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-ID: <20250710104531.3099313-6-alex.bennee@linaro.org>
-rw-r--r--common-user/plugin-api.c.inc1
-rw-r--r--linux-user/meson.build5
-rw-r--r--linux-user/plugin-api.c1
3 files changed, 6 insertions, 1 deletions
diff --git a/common-user/plugin-api.c.inc b/common-user/plugin-api.c.inc
index 5b8a139..63f3983 100644
--- a/common-user/plugin-api.c.inc
+++ b/common-user/plugin-api.c.inc
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "qemu/plugin.h"
+#include "accel/tcg/vcpu-state.h"
#include "qemu.h"
/*
diff --git a/linux-user/meson.build b/linux-user/meson.build
index f47a213..efca843 100644
--- a/linux-user/meson.build
+++ b/linux-user/meson.build
@@ -27,7 +27,10 @@ linux_user_ss.add(libdw)
linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c'))
linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c'))
linux_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('semihost.c'))
-linux_user_ss.add(when: 'CONFIG_TCG_PLUGINS', if_true: files('plugin-api.c'))
+
+if get_option('plugins')
+ linux_user_ss.add(files('plugin-api.c'))
+endif
syscall_nr_generators = {}
diff --git a/linux-user/plugin-api.c b/linux-user/plugin-api.c
index 66755df..8d6fbb6 100644
--- a/linux-user/plugin-api.c
+++ b/linux-user/plugin-api.c
@@ -12,4 +12,5 @@
#include "qemu/osdep.h"
#include "qemu.h"
+#include "loader.h"
#include "common-user/plugin-api.c.inc"