From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Sun, 22 Apr 2012 23:52:19 +0000 (+0000)
Subject: S390: fix kernel_commandline handling
X-Git-Tag: v1.1-rc0~3^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc3c7384ac61728e9949d5e64c10664fe4510179;p=thirdparty%2Fqemu.git

S390: fix kernel_commandline handling

The current handling of kernel parameters is broken. The pointer
is always valid, even if no -kernel or -append is specified.
We must check if the kernel rom address is valid instead,
otherwise qemu might segfault.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 1ebe70d0e3e..c79784c0c8e 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -274,7 +274,7 @@ static void s390_init(ram_addr_t my_ram_size,
         memcpy(rom_ptr(INITRD_PARM_SIZE), &initrd_size, 8);
     }
 
-    if (kernel_cmdline) {
+    if (rom_ptr(KERN_PARM_AREA)) {
         /* we have to overwrite values in the kernel image, which are "rom" */
         memcpy(rom_ptr(KERN_PARM_AREA), kernel_cmdline,
                strlen(kernel_cmdline) + 1);