From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>
Subject: [PULL 28/31] plugins/api: split out time control helpers
Date: Sat, 8 Mar 2025 21:53:23 +0000 [thread overview]
Message-ID: <20250308215326.2907828-29-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org>
These are only usable in system mode where we control the timer. For
user-mode make them NOPs.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250304222439.2035603-29-alex.bennee@linaro.org>
diff --git a/plugins/api-system.c b/plugins/api-system.c
index 38560de342..cc190b167e 100644
--- a/plugins/api-system.c
+++ b/plugins/api-system.c
@@ -95,3 +95,37 @@ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h)
return g_intern_static_string("RAM");
}
}
+
+/*
+ * Time control
+ */
+static bool has_control;
+static Error *migration_blocker;
+
+const void *qemu_plugin_request_time_control(void)
+{
+ if (!has_control) {
+ has_control = true;
+ error_setg(&migration_blocker,
+ "TCG plugin time control does not support migration");
+ migrate_add_blocker(&migration_blocker, NULL);
+ return &has_control;
+ }
+ return NULL;
+}
+
+static void advance_virtual_time__async(CPUState *cpu, run_on_cpu_data data)
+{
+ int64_t new_time = data.host_ulong;
+ qemu_clock_advance_virtual_time(new_time);
+}
+
+void qemu_plugin_update_ns(const void *handle, int64_t new_time)
+{
+ if (handle == &has_control) {
+ /* Need to execute out of cpu_exec, so bql can be locked. */
+ async_run_on_cpu(current_cpu,
+ advance_virtual_time__async,
+ RUN_ON_CPU_HOST_ULONG(new_time));
+ }
+}
diff --git a/plugins/api-user.c b/plugins/api-user.c
index 867b420339..28704a89e8 100644
--- a/plugins/api-user.c
+++ b/plugins/api-user.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/plugin.h"
+#include "exec/log.h"
/*
* Virtual Memory queries - these are all NOPs for user-mode which
@@ -38,3 +39,19 @@ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h)
{
return g_intern_static_string("Invalid");
}
+
+/*
+ * Time control - for user mode the only real time is wall clock time
+ * so realistically all you can do in user mode is slow down execution
+ * which doesn't require the ability to mess with the clock.
+ */
+
+const void *qemu_plugin_request_time_control(void)
+{
+ return NULL;
+}
+
+void qemu_plugin_update_ns(const void *handle, int64_t new_time)
+{
+ qemu_log_mask(LOG_UNIMP, "user-mode can't control time");
+}
diff --git a/plugins/api.c b/plugins/api.c
index 82241699a5..832bf6ee5e 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -526,44 +526,3 @@ uint64_t qemu_plugin_u64_sum(qemu_plugin_u64 entry)
return total;
}
-/*
- * Time control
- */
-static bool has_control;
-#ifdef CONFIG_SOFTMMU
-static Error *migration_blocker;
-#endif
-
-const void *qemu_plugin_request_time_control(void)
-{
- if (!has_control) {
- has_control = true;
-#ifdef CONFIG_SOFTMMU
- error_setg(&migration_blocker,
- "TCG plugin time control does not support migration");
- migrate_add_blocker(&migration_blocker, NULL);
-#endif
- return &has_control;
- }
- return NULL;
-}
-
-#ifdef CONFIG_SOFTMMU
-static void advance_virtual_time__async(CPUState *cpu, run_on_cpu_data data)
-{
- int64_t new_time = data.host_ulong;
- qemu_clock_advance_virtual_time(new_time);
-}
-#endif
-
-void qemu_plugin_update_ns(const void *handle, int64_t new_time)
-{
-#ifdef CONFIG_SOFTMMU
- if (handle == &has_control) {
- /* Need to execute out of cpu_exec, so bql can be locked. */
- async_run_on_cpu(current_cpu,
- advance_virtual_time__async,
- RUN_ON_CPU_HOST_ULONG(new_time));
- }
-#endif
-}
--
2.39.5
next prev parent reply other threads:[~2025-03-08 22:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-08 21:52 [PULL 00/31] testing, plugin and maintainer updates Alex Bennée
2025-03-08 21:52 ` [PULL 01/31] tests/functional: move aarch64 GPU test into own file Alex Bennée
2025-03-08 21:52 ` [PULL 02/31] tests/functional: factor out common code in gpu test Alex Bennée
2025-03-08 21:52 ` [PULL 03/31] tests/functional: ensure we have a GPU device for tests Alex Bennée
2025-03-08 21:52 ` [PULL 04/31] tests/functional: bail early if vkmark hangs Alex Bennée
2025-03-08 21:53 ` [PULL 05/31] tests/functional: skip vulkan tests with nVidia Alex Bennée
2025-03-08 21:53 ` [PULL 06/31] tests/functional: expand tests to cover virgl Alex Bennée
2025-03-08 21:53 ` [PULL 07/31] tests/functional: update the aarch64_virg_gpu images Alex Bennée
2025-03-08 21:53 ` [PULL 08/31] plugins: add explicit dependency in functional tests Alex Bennée
2025-03-08 21:53 ` [PULL 09/31] tests/functional: Introduce the dso_suffix() helper Alex Bennée
2025-03-08 21:53 ` [PULL 10/31] tests/functional: Allow running TCG plugins tests on non-Linux/BSD hosts Alex Bennée
2025-03-08 21:53 ` [PULL 11/31] libvirt-ci: bump to latest for vulkan-tools Alex Bennée
2025-03-08 21:53 ` [PULL 12/31] tests/vm: bump timeout for shutdown Alex Bennée
2025-03-08 21:53 ` [PULL 13/31] tests/tcg: mark test-vma as a linux-only test Alex Bennée
2025-03-08 21:53 ` [PULL 14/31] tests/tcg: add message to _Static_assert in test-avx Alex Bennée
2025-03-08 21:53 ` [PULL 15/31] tests/tcg: fix constraints in test-i386-adcox Alex Bennée
2025-03-08 21:53 ` [PULL 16/31] tests/tcg: enable -fwrapv for test-i386-bmi Alex Bennée
2025-03-08 21:53 ` [PULL 17/31] tests/tcg: Suppress compiler false-positive warning on sha1.c Alex Bennée
2025-03-08 21:53 ` [PULL 18/31] gitlab: add a new build_unit job to track build size Alex Bennée
2025-03-08 21:53 ` [PULL 19/31] tests/functional: add boot error detection for RME tests Alex Bennée
2025-03-08 21:53 ` [PULL 20/31] plugins/api: use qemu_target_page_mask() to get value Alex Bennée
2025-03-08 21:53 ` [PULL 21/31] plugins/loader: populate target_name with target_name() Alex Bennée
2025-03-08 21:53 ` [PULL 22/31] include/qemu: plugin-memory.h doesn't need cpu-defs.h Alex Bennée
2025-03-08 21:53 ` [PULL 23/31] plugins/api: clean-up the includes Alex Bennée
2025-03-08 21:53 ` [PULL 24/31] plugins/plugin.h: include queue.h Alex Bennée
2025-03-08 21:53 ` [PULL 25/31] plugins/loader: compile loader only once Alex Bennée
2025-03-08 21:53 ` [PULL 26/31] plugins/api: split out binary path/start/end/entry code Alex Bennée
2025-03-08 21:53 ` [PULL 27/31] plugins/api: split out the vaddr/hwaddr helpers Alex Bennée
2025-03-08 21:53 ` Alex Bennée [this message]
2025-03-08 21:53 ` [PULL 29/31] plugins/api: build only once Alex Bennée
2025-03-08 21:53 ` [PULL 30/31] plugins/core: make a single build unit Alex Bennée
2025-03-08 21:53 ` [PULL 31/31] MAINTAINERS: remove widely sanctioned entities Alex Bennée
2025-03-09 3:44 ` [PULL 00/31] testing, plugin and maintainer updates Stefan Hajnoczi
2025-03-09 21:02 ` Alex Bennée
2025-03-10 5:44 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250308215326.2907828-29-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=erdnaxe@crans.org \
--cc=ma.mandourr@gmail.com \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).