On Wed, 1 Oct 2025, Philippe Mathieu-Daudé wrote:
In order to remove the convenient CPUState::as field, access
the vcpu first address space using the cpu_get_address_space()
helper.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
monitor/hmp-cmds-target.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
index e9820611466..602af851328 100644
--- a/monitor/hmp-cmds-target.c
+++ b/monitor/hmp-cmds-target.c
@@ -128,6 +128,8 @@ static void memory_dump(Monitor *mon, int count, int
format, int wsize,
uint8_t buf[16];
uint64_t v;
CPUState *cs = mon_get_cpu(mon);
+ AddressSpace *as = cs ? cpu_get_address_space(cs, 0)
+ : &address_space_memory;
Why move from local scope to an upper level?
Regards,
BALATON Zoltan
if (!cs && (format == 'i' || !is_physical)) {
monitor_printf(mon, "Can not dump without CPU\n");
@@ -174,7 +176,6 @@ static void memory_dump(Monitor *mon, int count, int
format, int wsize,
if (l > line_size)
l = line_size;
if (is_physical) {
- AddressSpace *as = cs ? cs->as : &address_space_memory;
MemTxResult r = address_space_read(as, addr,
MEMTXATTRS_UNSPECIFIED, buf, l);
if (r != MEMTX_OK) {