[PATCH 01/13] plugins: change signature of qemu_plugin_insn_haddr

[Pierrick Bouvier]

It makes more sense to return the same type than qemu_plugin_insn_vaddr.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 include/qemu/qemu-plugin.h |  2 +-
 plugins/api.c              | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index 0fba36ae028..1fbcff6e1d2 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -537,7 +537,7 @@ uint64_t qemu_plugin_insn_vaddr(const struct 
qemu_plugin_insn *insn);
  * Returns: hardware (physical) target address of instruction
  */
 QEMU_PLUGIN_API
-void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn);
+uint64_t qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn);
 
 /**
  * typedef qemu_plugin_meminfo_t - opaque memory transaction handle
diff --git a/plugins/api.c b/plugins/api.c
index 24ea64e2de5..17b3a65e773 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -283,13 +283,13 @@ uint64_t qemu_plugin_insn_vaddr(const struct 
qemu_plugin_insn *insn)
     return insn->vaddr;
 }
 
-void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn)
+uint64_t qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn)
 {
     const DisasContextBase *db = tcg_ctx->plugin_db;
     vaddr page0_last = db->pc_first | ~TARGET_PAGE_MASK;
 
     if (db->fake_insn) {
-        return NULL;
+        return 0;
     }
 
     /*
@@ -300,14 +300,14 @@ void *qemu_plugin_insn_haddr(const struct 
qemu_plugin_insn *insn)
      */
     if (insn->vaddr <= page0_last) {
         if (db->host_addr[0] == NULL) {
-            return NULL;
+            return 0;
         }
-        return db->host_addr[0] + insn->vaddr - db->pc_first;
+        return (uintptr_t) (db->host_addr[0] + insn->vaddr - db->pc_first);
     } else {
         if (db->host_addr[1] == NULL) {
-            return NULL;
+            return 0;
         }
-        return db->host_addr[1] + insn->vaddr - (page0_last + 1);
+        return (uintptr_t) (db->host_addr[1] + insn->vaddr - (page0_last + 1));
     }
 }
 
-- 
2.39.5