summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2015-10-12 17:54:39 +0100
committerLeon Alrae <leon.alrae@imgtec.com>2015-10-30 13:30:14 +0000
commitca2f6bbbce32b7e1ba4fdaf54165ab0dee47a3a5 (patch)
treecfcdeb5bd75da9ad57bab40aec36dfd180a33ebb /hw
parentdbd8af9824d0ddc4400f859c2af77543461cba0d (diff)
downloadqemu-ca2f6bbbce32b7e1ba4fdaf54165ab0dee47a3a5.tar.gz
qemu-ca2f6bbbce32b7e1ba4fdaf54165ab0dee47a3a5.tar.bz2
qemu-ca2f6bbbce32b7e1ba4fdaf54165ab0dee47a3a5.zip
hw/mips_malta: Fix KVM PC initialisation
Commit 71c199c81d29 ("mips_malta: provide ememsize env variable to kernels") changed the meaning of loaderparams.ram_size to be the whole of RAM rather than just the low part below where the boot code is placed for KVM, but it didn't update the PC initialisation for KVM to use ram_low_size. Fix that now. Fixes: 71c199c81d29 ("mips_malta: provide ememsize env variable to kernels") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Leon Alrae <leon.alrae@imgtec.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Leon Alrae <leon.alrae@imgtec.com> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/mips/mips_malta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index c1f570a79f..91c36baa55 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -901,7 +901,7 @@ static void main_cpu_reset(void *opaque)
if (kvm_enabled()) {
/* Start running from the bootloader we wrote to end of RAM */
- env->active_tc.PC = 0x40000000 + loaderparams.ram_size;
+ env->active_tc.PC = 0x40000000 + loaderparams.ram_low_size;
}
}