Commit 6ad593a75a for qemu.org

commit 6ad593a75a89c32bb03184b68f9351a485dcf461
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Sun Dec 21 12:49:05 2025 +0100

    monitor/hmp: Use plain uint64_t @addr argument in memory_dump()

    memory_dump() takes either hwaddr or vaddr type, depending
    on the @is_physical argument. Simply use uint64_t type which
    is common to both.
    Pad address using field width formatting, removing the need
    for the target_ulong type.

    Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
    Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
    Message-Id: <20251229231546.50604-4-philmd@linaro.org>

diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
index 51dcb9e314..e855c0d8a2 100644
--- a/monitor/hmp-cmds-target.c
+++ b/monitor/hmp-cmds-target.c
@@ -122,12 +122,13 @@ void hmp_info_registers(Monitor *mon, const QDict *qdict)
 }

 static void memory_dump(Monitor *mon, int count, int format, int wsize,
-                        hwaddr addr, bool is_physical)
+                        uint64_t addr, bool is_physical)
 {
     int l, line_size, i, max_digits, len;
     uint8_t buf[16];
     uint64_t v;
     CPUState *cs = mon_get_cpu(mon);
+    const unsigned int addr_width = is_physical ? 8 : (target_long_bits() * 2);

     if (!cs && (format == 'i' || !is_physical)) {
         monitor_printf(mon, "Can not dump without CPU\n");
@@ -165,11 +166,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize,
     }

     while (len > 0) {
-        if (is_physical) {
-            monitor_printf(mon, HWADDR_FMT_plx ":", addr);
-        } else {
-            monitor_printf(mon, TARGET_FMT_lx ":", (target_ulong)addr);
-        }
+        monitor_printf(mon, "%0*" PRIx64 ":", addr_width, addr);
         l = len;
         if (l > line_size)
             l = line_size;