| Message ID | 20211214195048.1438209-1-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] monitor: move x-query-profile into accel/tcg to fix build | expand |
On Tue, Dec 14, 2021 at 07:50:48PM +0000, 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 > > --- > v2 > - enclosed in #ifndef CONFIG_USER_ONLY section > --- > qapi/machine.json | 1 + > accel/tcg/cpu-exec.c | 31 +++++++++++++++++++++++++++++++ > monitor/qmp-cmds.c | 31 ------------------------------- > 3 files changed, 32 insertions(+), 31 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Sorry about the mess up I introduced in refactoring, and thanks for fixing it for me. Regards, Daniel
Daniel P. Berrangé <berrange@redhat.com> writes: > On Tue, Dec 14, 2021 at 07:50:48PM +0000, 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 >> >> --- >> v2 >> - enclosed in #ifndef CONFIG_USER_ONLY section >> --- >> qapi/machine.json | 1 + >> accel/tcg/cpu-exec.c | 31 +++++++++++++++++++++++++++++++ >> monitor/qmp-cmds.c | 31 ------------------------------- >> 3 files changed, 32 insertions(+), 31 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > Sorry about the mess up I introduced in refactoring, and thanks for > fixing it for me. Thanks for the review - now await v3 as I can see my CI died on a whole bunch of non-TCG builds! > > Regards, > Daniel
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;
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 --- v2 - enclosed in #ifndef CONFIG_USER_ONLY section --- qapi/machine.json | 1 + accel/tcg/cpu-exec.c | 31 +++++++++++++++++++++++++++++++ monitor/qmp-cmds.c | 31 ------------------------------- 3 files changed, 32 insertions(+), 31 deletions(-)