Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into staging

Pull request

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmo0MGQACgkQnKSrs4Gr
# c8h0Kwf7BUBMQJs+L6/turY8p29MPXuFPNFqG6RAqr/PfMeJ0qTlt7UQG+wGPCDc
# 0XJnUAUqfLBCIFg3tjCSvbPL5HXluy4UsyXK7T/e5ByVBf2CJRpSnJ1Ps1ZU8E70
# foEKjG8Z5MTCG6gGVb27Kmdz6Kvsu5obXrP6WTj6twF4SDQmaHMzWu/YMlOuGEP1
# 9pwZxBS38kDDQF20jHhyr5ra6xcoSQPpXMum37FJruXkchbFbsg2zVGxU15ENE0d
# 3ErBHSVwScWebKwgN2qSsAdv2PqLNQGdiWJzjD3fXAE3D9SvpgDrYPs+99Vjv9bN
# hkkIIs5vcCghYzDJYUdvlj59iyPsUQ==
# =F1HG
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 18 Jun 2026 13:52:36 EDT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [ultimate]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [ultimate]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu:
  trace/control: Fix -Wunused-but-set-global warning with clang 23+

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
2026-06-19 14:58:10 -04:00

View File

@@ -38,7 +38,9 @@ static TraceEventGroup *event_groups;
static size_t nevent_groups;
static uint32_t next_id;
static uint32_t next_vcpu_id;
#ifdef CONFIG_TRACE_SIMPLE
static bool init_trace_on_startup;
#endif
static char *trace_opts_file;
QemuOptsList qemu_trace_opts = {
@@ -295,7 +297,9 @@ void trace_opt_parse(const char *optstr)
trace_enable_events(qemu_opt_get(opts, "enable"));
}
trace_init_events(qemu_opt_get(opts, "events"));
#ifdef CONFIG_TRACE_SIMPLE
init_trace_on_startup = true;
#endif
g_free(trace_opts_file);
trace_opts_file = g_strdup(qemu_opt_get(opts, "file"));
qemu_opts_del(opts);