* [PATCH v3] monitor: move x-query-profile into accel/tcg to fix build
@ 2021-12-15 14:04 Alex Bennée
2021-12-15 14:12 ` Philippe Mathieu-Daudé
2021-12-15 21:18 ` Mark Cave-Ayland
0 siblings, 2 replies; 3+ messages in thread
From: Alex Bennée @ 2021-12-15 14:04 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Daniel P . Berrangé,
Richard Henderson, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Dr. David Alan Gilbert, Eric Blake,
Markus Armbruster, Paolo Bonzini, Alex Bennée
As --enable-profiler isn't defended in CI we missed this breakage.
Move the qmp handler into accel/tcg so we have access to the helpers
we need. While we are at it ensure we gate the feature on CONFIG_TCG.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: 37087fde0e ("qapi: introduce x-query-profile QMP command")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/773
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20211214195048.1438209-1-alex.bennee@linaro.org>
---
v3
- also add #ifdef CONFIG_TCG to hmp-commands-info.hx
---
qapi/machine.json | 1 +
accel/tcg/cpu-exec.c | 31 +++++++++++++++++++++++++++++++
monitor/qmp-cmds.c | 31 -------------------------------
hmp-commands-info.hx | 2 ++
4 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 067e3f5378..0c9f24a712 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1492,6 +1492,7 @@
##
{ 'command': 'x-query-profile',
'returns': 'HumanReadableText',
+ 'if': 'CONFIG_TCG',
'features': [ 'unstable' ] }
##
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 409ec8c38c..8b4cd6c59d 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -1090,4 +1090,35 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)
return human_readable_text_from_str(buf);
}
+#ifdef CONFIG_PROFILER
+
+int64_t dev_time;
+
+HumanReadableText *qmp_x_query_profile(Error **errp)
+{
+ g_autoptr(GString) buf = g_string_new("");
+ static int64_t last_cpu_exec_time;
+ int64_t cpu_exec_time;
+ int64_t delta;
+
+ cpu_exec_time = tcg_cpu_exec_time();
+ delta = cpu_exec_time - last_cpu_exec_time;
+
+ g_string_append_printf(buf, "async time %" PRId64 " (%0.3f)\n",
+ dev_time, dev_time / (double)NANOSECONDS_PER_SECOND);
+ g_string_append_printf(buf, "qemu time %" PRId64 " (%0.3f)\n",
+ delta, delta / (double)NANOSECONDS_PER_SECOND);
+ last_cpu_exec_time = cpu_exec_time;
+ dev_time = 0;
+
+ return human_readable_text_from_str(buf);
+}
+#else
+HumanReadableText *qmp_x_query_profile(Error **errp)
+{
+ error_setg(errp, "Internal profiler not compiled");
+ return NULL;
+}
+#endif
+
#endif /* !CONFIG_USER_ONLY */
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 343353e27a..be5e44c569 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -355,37 +355,6 @@ void qmp_display_reload(DisplayReloadOptions *arg, Error **errp)
}
}
-#ifdef CONFIG_PROFILER
-
-int64_t dev_time;
-
-HumanReadableText *qmp_x_query_profile(Error **errp)
-{
- g_autoptr(GString) buf = g_string_new("");
- static int64_t last_cpu_exec_time;
- int64_t cpu_exec_time;
- int64_t delta;
-
- cpu_exec_time = tcg_cpu_exec_time();
- delta = cpu_exec_time - last_cpu_exec_time;
-
- g_string_append_printf(buf, "async time %" PRId64 " (%0.3f)\n",
- dev_time, dev_time / (double)NANOSECONDS_PER_SECOND);
- g_string_append_printf(buf, "qemu time %" PRId64 " (%0.3f)\n",
- delta, delta / (double)NANOSECONDS_PER_SECOND);
- last_cpu_exec_time = cpu_exec_time;
- dev_time = 0;
-
- return human_readable_text_from_str(buf);
-}
-#else
-HumanReadableText *qmp_x_query_profile(Error **errp)
-{
- error_setg(errp, "Internal profiler not compiled");
- return NULL;
-}
-#endif
-
static int qmp_x_query_rdma_foreach(Object *obj, void *opaque)
{
RdmaProvider *rdma;
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 407a1da800..e90f20a107 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -358,6 +358,7 @@ SRST
Show host USB devices.
ERST
+#if defined(CONFIG_TCG)
{
.name = "profile",
.args_type = "",
@@ -365,6 +366,7 @@ ERST
.help = "show profiling information",
.cmd_info_hrt = qmp_x_query_profile,
},
+#endif
SRST
``info profile``
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] monitor: move x-query-profile into accel/tcg to fix build
2021-12-15 14:04 [PATCH v3] monitor: move x-query-profile into accel/tcg to fix build Alex Bennée
@ 2021-12-15 14:12 ` Philippe Mathieu-Daudé
2021-12-15 21:18 ` Mark Cave-Ayland
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-15 14:12 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Daniel P . Berrangé,
Richard Henderson, Mark Cave-Ayland, Dr. David Alan Gilbert,
Markus Armbruster, Paolo Bonzini, Eric Blake
On 12/15/21 15:04, Alex Bennée wrote:
> As --enable-profiler isn't defended in CI we missed this breakage.
> Move the qmp handler into accel/tcg so we have access to the helpers
> we need. While we are at it ensure we gate the feature on CONFIG_TCG.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Fixes: 37087fde0e ("qapi: introduce x-query-profile QMP command")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/773
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Message-Id: <20211214195048.1438209-1-alex.bennee@linaro.org>
>
> ---
> v3
> - also add #ifdef CONFIG_TCG to hmp-commands-info.hx
> ---
> qapi/machine.json | 1 +
> accel/tcg/cpu-exec.c | 31 +++++++++++++++++++++++++++++++
> monitor/qmp-cmds.c | 31 -------------------------------
> hmp-commands-info.hx | 2 ++
> 4 files changed, 34 insertions(+), 31 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] monitor: move x-query-profile into accel/tcg to fix build
2021-12-15 14:04 [PATCH v3] monitor: move x-query-profile into accel/tcg to fix build Alex Bennée
2021-12-15 14:12 ` Philippe Mathieu-Daudé
@ 2021-12-15 21:18 ` Mark Cave-Ayland
1 sibling, 0 replies; 3+ messages in thread
From: Mark Cave-Ayland @ 2021-12-15 21:18 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Daniel P . Berrangé,
Eric Blake, Richard Henderson, Dr. David Alan Gilbert,
Markus Armbruster, Paolo Bonzini, Philippe Mathieu-Daudé
On 15/12/2021 14:04, Alex Bennée wrote:
> As --enable-profiler isn't defended in CI we missed this breakage.
> Move the qmp handler into accel/tcg so we have access to the helpers
> we need. While we are at it ensure we gate the feature on CONFIG_TCG.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Fixes: 37087fde0e ("qapi: introduce x-query-profile QMP command")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/773
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Message-Id: <20211214195048.1438209-1-alex.bennee@linaro.org>
>
> ---
> v3
> - also add #ifdef CONFIG_TCG to hmp-commands-info.hx
> ---
> qapi/machine.json | 1 +
> accel/tcg/cpu-exec.c | 31 +++++++++++++++++++++++++++++++
> monitor/qmp-cmds.c | 31 -------------------------------
> hmp-commands-info.hx | 2 ++
> 4 files changed, 34 insertions(+), 31 deletions(-)
>
> diff --git a/qapi/machine.json b/qapi/machine.json
> index 067e3f5378..0c9f24a712 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -1492,6 +1492,7 @@
> ##
> { 'command': 'x-query-profile',
> 'returns': 'HumanReadableText',
> + 'if': 'CONFIG_TCG',
> 'features': [ 'unstable' ] }
>
> ##
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 409ec8c38c..8b4cd6c59d 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -1090,4 +1090,35 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)
> return human_readable_text_from_str(buf);
> }
>
> +#ifdef CONFIG_PROFILER
> +
> +int64_t dev_time;
> +
> +HumanReadableText *qmp_x_query_profile(Error **errp)
> +{
> + g_autoptr(GString) buf = g_string_new("");
> + static int64_t last_cpu_exec_time;
> + int64_t cpu_exec_time;
> + int64_t delta;
> +
> + cpu_exec_time = tcg_cpu_exec_time();
> + delta = cpu_exec_time - last_cpu_exec_time;
> +
> + g_string_append_printf(buf, "async time %" PRId64 " (%0.3f)\n",
> + dev_time, dev_time / (double)NANOSECONDS_PER_SECOND);
> + g_string_append_printf(buf, "qemu time %" PRId64 " (%0.3f)\n",
> + delta, delta / (double)NANOSECONDS_PER_SECOND);
> + last_cpu_exec_time = cpu_exec_time;
> + dev_time = 0;
> +
> + return human_readable_text_from_str(buf);
> +}
> +#else
> +HumanReadableText *qmp_x_query_profile(Error **errp)
> +{
> + error_setg(errp, "Internal profiler not compiled");
> + return NULL;
> +}
> +#endif
> +
> #endif /* !CONFIG_USER_ONLY */
> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
> index 343353e27a..be5e44c569 100644
> --- a/monitor/qmp-cmds.c
> +++ b/monitor/qmp-cmds.c
> @@ -355,37 +355,6 @@ void qmp_display_reload(DisplayReloadOptions *arg, Error **errp)
> }
> }
>
> -#ifdef CONFIG_PROFILER
> -
> -int64_t dev_time;
> -
> -HumanReadableText *qmp_x_query_profile(Error **errp)
> -{
> - g_autoptr(GString) buf = g_string_new("");
> - static int64_t last_cpu_exec_time;
> - int64_t cpu_exec_time;
> - int64_t delta;
> -
> - cpu_exec_time = tcg_cpu_exec_time();
> - delta = cpu_exec_time - last_cpu_exec_time;
> -
> - g_string_append_printf(buf, "async time %" PRId64 " (%0.3f)\n",
> - dev_time, dev_time / (double)NANOSECONDS_PER_SECOND);
> - g_string_append_printf(buf, "qemu time %" PRId64 " (%0.3f)\n",
> - delta, delta / (double)NANOSECONDS_PER_SECOND);
> - last_cpu_exec_time = cpu_exec_time;
> - dev_time = 0;
> -
> - return human_readable_text_from_str(buf);
> -}
> -#else
> -HumanReadableText *qmp_x_query_profile(Error **errp)
> -{
> - error_setg(errp, "Internal profiler not compiled");
> - return NULL;
> -}
> -#endif
> -
> static int qmp_x_query_rdma_foreach(Object *obj, void *opaque)
> {
> RdmaProvider *rdma;
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index 407a1da800..e90f20a107 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -358,6 +358,7 @@ SRST
> Show host USB devices.
> ERST
>
> +#if defined(CONFIG_TCG)
> {
> .name = "profile",
> .args_type = "",
> @@ -365,6 +366,7 @@ ERST
> .help = "show profiling information",
> .cmd_info_hrt = qmp_x_query_profile,
> },
> +#endif
>
> SRST
> ``info profile``
Thanks Alex, I can confirm that a build of git master with --enable-profiler now
works for my test case with this patch applied:
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
ATB,
Mark.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-15 21:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-15 14:04 [PATCH v3] monitor: move x-query-profile into accel/tcg to fix build Alex Bennée
2021-12-15 14:12 ` Philippe Mathieu-Daudé
2021-12-15 21:18 ` Mark Cave-Ayland
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.