aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2025-03-12 07:47:54 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2025-03-12 07:47:54 +0800
commit92e4cce842b2a00d6bce54993f34444dc13d8513 (patch)
treeaad1eacea35fdb9aa167bde045fe1c351a66ed2e
parent825b96dbcee23d134b691fc75618b59c5f53da32 (diff)
parenta506a1b16702aae69a43e782f225bdc0ec6545fc (diff)
downloadqemu-92e4cce842b2a00d6bce54993f34444dc13d8513.zip
qemu-92e4cce842b2a00d6bce54993f34444dc13d8513.tar.gz
qemu-92e4cce842b2a00d6bce54993f34444dc13d8513.tar.bz2
Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into staging
Pull request A tracing cleanup. # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmfPpaMACgkQnKSrs4Gr # c8iC2wf/WuKijQF2eQ6R5kVY/z3H+8eg1oR3MaeRgnzFDf5Dp9H4JxNEPXssdC7p # Dg0mXL2FhdaaQcZ9VAuyEJGtGkcbNzpXixLto3+d1SNK4fWv1VlPASp8GiDkKxpt # nGhChUUVXLIv/wRX/eOVEuBFrUdDl/2Ri/3dMij0cZsa361KiSIygHQqF3QyspIr # crU9B1+7ti38x/Zem+J+Wrb4VHRgJk29QUqLnH4w9j4p3LtE5cfUndlTnx28Xwkl # bZ45XCnEu2GabaSrOmGGiAyC89w6iuxxwsnlVqg0g8fyxpUbzfhsh70FCalKfgWo # TetDo7penusK2CBlWbrCA5BKMF29Tg== # =2HWS # -----END PGP SIGNATURE----- # gpg: Signature made Tue 11 Mar 2025 10:53:23 HKT # 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-target: cleanup headers and make compilation unit common Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--trace/control-target.c2
-rw-r--r--trace/meson.build4
2 files changed, 1 insertions, 5 deletions
diff --git a/trace/control-target.c b/trace/control-target.c
index d58e84f..57ceac2 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -8,8 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/lockable.h"
-#include "cpu.h"
#include "trace/control.h"
diff --git a/trace/meson.build b/trace/meson.build
index c3412dc..3df4549 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -1,6 +1,4 @@
-system_ss.add(files('trace-hmp-cmds.c'))
-
-specific_ss.add(files('control-target.c'))
+system_ss.add(files('control-target.c', 'trace-hmp-cmds.c'))
trace_events_files = []
foreach item : [ '.' ] + trace_events_subdirs + qapi_trace_events