Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging

[mirror_qemu.git] / trace / mem.h

diff --git a/trace/mem.h b/trace/mem.h
index c76a572689f3d6c73e985f06f5b7b5e1c3fea139..9644f592b4f249779aab5b500be3d96d811ad738 100644 (file)
--- a/trace/mem.h
+++ b/trace/mem.h
@@ -18,17 +18,18 @@
  *
  * Return a value for the 'info' argument in guest memory access traces.
  */
-static uint8_t trace_mem_get_info(TCGMemOp op, bool store);
+static uint16_t trace_mem_get_info(MemOp op, unsigned int mmu_idx, bool store);
 
 /**
  * trace_mem_build_info:
  *
  * Return a value for the 'info' argument in guest memory access traces.
  */
-static uint8_t trace_mem_build_info(TCGMemOp size, bool sign_extend,
-                                    TCGMemOp endianness, bool store);
+static uint16_t trace_mem_build_info(int size_shift, bool sign_extend,
+                                     MemOp endianness, bool store,
+                                     unsigned int mmuidx);
 
 
 #include "trace/mem-internal.h"
 
-#endif  /* TRACE__MEM_H */
+#endif /* TRACE__MEM_H */