[Qemu-stable] Fwd: [Qemu-devel] [PATCH] s390x: fix -initrd in virtio machine

[Alexander Graf]

This patch should also go into -stable once it hits master.


Alex

Begin forwarded message:

> From: Alexander Graf <address@hidden>
> Subject: [Qemu-devel] [PATCH] s390x: fix -initrd in virtio machine
> Date: 19. September 2012 17:29:38 MESZ
> To: qemu-devel qemu-devel <address@hidden>
> Cc: Christian Borntraeger <address@hidden>, Richard Henderson <address@hidden>
> 
> When using -initrd in the virtio machine, we need to indicate the initrd
> start and size inside the kernel image. These parameters need to be stored
> in native endianness.
> 
> Signed-off-by: Alexander Graf <address@hidden>
> ---
> hw/s390-virtio.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
> index 47eed35..12ae612 100644
> --- a/hw/s390-virtio.c
> +++ b/hw/s390-virtio.c
> @@ -284,8 +284,8 @@ static void s390_init(ram_addr_t my_ram_size,
>         }
> 
>         /* we have to overwrite values in the kernel image, which are "rom" */
> -        memcpy(rom_ptr(INITRD_PARM_START), &initrd_offset, 8);
> -        memcpy(rom_ptr(INITRD_PARM_SIZE), &initrd_size, 8);
> +        stq_p(rom_ptr(INITRD_PARM_START), initrd_offset);
> +        stq_p(rom_ptr(INITRD_PARM_SIZE), initrd_size);
>     }
> 
>     if (rom_ptr(KERN_PARM_AREA)) {
> -- 
> 1.6.0.2
> 
>