When the MemTxAttrs value is not specified and no MemTxResult
provided, address_space_ld/st() is equivalent to the simpler
ld/st_phys() API variant. Use the latter.
The _notdirty() variant is supposed to /not/ mark the updated
CODE page as dirty, to not re-translate it. However this code
is only used with the '-kernel' CLI option after the machine
is created and /before/ the vCPUs run, and *only* during the
first (cold) reset; not during following (hot) resets. The
optimisation is totally not justified, since we haven't
translated any guest code yet. Replace by the normal stl_phys()
helper.
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/aspeed.c | 3 +--
hw/arm/boot.c | 6 ++----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 3a5071a3841..8ce82f1f622 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -77,8 +77,7 @@ static void aspeed_reset_secondary(ARMCPU *cpu,
CPUState *cs = CPU(cpu);
/* info->smp_bootreg_addr */
- address_space_stl_notdirty(as, AST_SMP_MBOX_FIELD_GOSIGN, 0,
- MEMTXATTRS_UNSPECIFIED, NULL);
+ stl_phys(as, AST_SMP_MBOX_FIELD_GOSIGN, 0);
cpu_set_pc(cs, info->smp_loader_start);
}
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index b91660208f5..5ca9c8db5cc 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -266,8 +266,7 @@ static void default_reset_secondary(ARMCPU *cpu,
AddressSpace *as = arm_boot_address_space(cpu, info);
CPUState *cs = CPU(cpu);
- address_space_stl_notdirty(as, info->smp_bootreg_addr,
- 0, MEMTXATTRS_UNSPECIFIED, NULL);
+ stl_phys(as, info->smp_bootreg_addr, 0);
cpu_set_pc(cs, info->smp_loader_start);
}
@@ -277,8 +276,7 @@ static inline bool have_dtb(const struct arm_boot_info *info)
}
#define WRITE_WORD(p, value) do { \
- address_space_stl_notdirty(as, p, value, \
- MEMTXATTRS_UNSPECIFIED, NULL); \
+ stl_phys(as, p, value); \
p += 4; \
} while (0)
--
2.52.0