Use cpu_set_pc() for setting program counters when bootloading. This removes an instance of system level code having to reach into the CPU env.
Reviewed-by: Andreas Färber <afaer...@suse.de> Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> --- changed since v2: Add () to function names in commit messages --- dtc | 2 +- hw/microblaze/boot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dtc b/dtc index 65cc4d2..bc895d6 160000 --- a/dtc +++ b/dtc @@ -1 +1 @@ -Subproject commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf +Subproject commit bc895d6d09695d05ceb8b52486ffe861d6cfbdde diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 4c44317..9f4698a 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -54,7 +54,7 @@ static void main_cpu_reset(void *opaque) env->regs[5] = boot_info.cmdline; env->regs[6] = boot_info.initrd_start; env->regs[7] = boot_info.fdt; - env->sregs[SR_PC] = boot_info.bootstrap_pc; + cpu_set_pc(CPU(cpu), boot_info.bootstrap_pc); if (boot_info.machine_cpu_reset) { boot_info.machine_cpu_reset(cpu); } -- 1.9.1