From bd33695d12a71daea2f622b52e5b6f2a0beef98b Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 17 Dec 2014 15:40:44 +0000 Subject: [PATCH] kvmtool: ARM: fix initrd functionality lkvm -i is currently broken on ARM/ARM64. We should not try to convert smaller-than-4GB addresses into 64-bit big endian and then stuff them into u32 variables if we expect to read anything other than 0 out of it. Adjust the type to u64 to write the proper address in BE format into the /chosen node (and also match the address size we formely posted) and let Linux thus read the right values. This fixes initrd functionality for ARM and ARM64 guests. Signed-off-by: Andre Przywara Acked-by: Marc Zyngier Signed-off-by: Will Deacon --- arm/fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/fdt.c b/arm/fdt.c index 5626931..4a33846 100644 --- a/arm/fdt.c +++ b/arm/fdt.c @@ -149,8 +149,8 @@ static int setup_fdt(struct kvm *kvm) /* Initrd */ if (kvm->arch.initrd_size != 0) { - u32 ird_st_prop = cpu_to_fdt64(kvm->arch.initrd_guest_start); - u32 ird_end_prop = cpu_to_fdt64(kvm->arch.initrd_guest_start + + u64 ird_st_prop = cpu_to_fdt64(kvm->arch.initrd_guest_start); + u64 ird_end_prop = cpu_to_fdt64(kvm->arch.initrd_guest_start + kvm->arch.initrd_size); _FDT(fdt_property(fdt, "linux,initrd-start",