]> xenbits.xensource.com Git - qemu-xen-unstable.git/commitdiff
hw/mips_malta: Fix KVM PC initialisation
authorJames Hogan <james.hogan@imgtec.com>
Mon, 12 Oct 2015 16:54:39 +0000 (17:54 +0100)
committerLeon Alrae <leon.alrae@imgtec.com>
Fri, 30 Oct 2015 13:30:14 +0000 (13:30 +0000)
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>
hw/mips/mips_malta.c

index c1f570a79f8feeb2dc70489e0c17c8f7d46d8091..91c36baa55d6a7d5fd8be9e17b6c7ba40048513f 100644 (file)
@@ -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;
     }
 }