Skip to contentSkip to conversation

target/s390x: Fix tracing header path in TCG mem_helper.c

PATCH Superseded Philippe Mathieu-Daudé 4 participants 4 messages Jun 6, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/s390x: Fix tracing header path in TCG mem_helper.c

Commit c9274b6bf0 ("target/s390x: start moving TCG-only code to tcg/") moved mem_helper.c, but the trace-events file is still in the parent directory, so is the generated trace.h.

---
Ideally we should only use trace events from current directory.

---
 target/s390x/tcg/mem_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/tcg/mem_helper.c +1 -1
index 6a308c5553..1fb6cbb6cf 100644
@@ -30,7 +30,7 @@
 #include "hw/core/tcg-cpu-ops.h"
 #include "qemu/int128.h"
 #include "qemu/atomic128.h"
-#include "trace.h"
+#include "../trace.h"
 
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/s390x/storage-keys.h"
Signature · 1 line
2.41.0
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Philippe Mathieu-Daudé

Commit c9274b6bf0 ("target/s390x: start moving TCG-only code to tcg/") moved mem_helper.c, but the trace-events file is still in the parent directory, so is the generated trace.h.

---
Ideally we should only use trace events from current directory.
---
 target/s390x/tcg/mem_helper.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 8 lines · Philippe Mathieu-Daudé

Commit c9274b6bf0 ("target/s390x: start moving TCG-only code to tcg/") moved mem_helper.c, but the trace-events file is still in the parent directory, so is the generated trace.h.

---
Ideally we should only use trace events from current directory.

Mmm, I was wondering if maybe that would be the better approach.

A quick grep suggests the only other place doing a "../trace.h" include is in include/hw/xen/interface/hvm/hvm_op.h, which is unrelated, because it's pulling in the non-autogenerated include/hw/xen/interface/trace.h.

-- PMM

#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 7 lines · Philippe Mathieu-Daudé

Commit c9274b6bf0 ("target/s390x: start moving TCG-only code to tcg/") moved mem_helper.c, but the trace-events file is still in the parent directory, so is the generated trace.h.

---
Ideally we should only use trace events from current directory.

Yes, that would be cleaner. Is it possible to move the relevant trace events to the trace-events file in target/s390x/tcg/?

Quoted 20 lines
---
 target/s390x/tcg/mem_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/tcg/mem_helper.c +1 -1
index 6a308c5553..1fb6cbb6cf 100644
@@ -30,7 +30,7 @@
 #include "hw/core/tcg-cpu-ops.h"
 #include "qemu/int128.h"
 #include "qemu/atomic128.h"
-#include "trace.h"
+#include "../trace.h"
 
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/s390x/storage-keys.h"
Signature · 1 line
2.41.0