From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Fri, 23 Sep 2011 03:38:12 +0000 (+0000)
Subject: s390: fix short kernel command lines
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=13449a6e0ecf6c73e34657100566a471f0c26bbb;p=qemu.git

s390: fix short kernel command lines

The default kernel command line for s390 is
"root=/dev/ram0 ro"

When overriding this line, we have to ensure to also copy the \0 to
avoid false lines, for example, -append "root=/dev/vda" will result in
"root=/dev/vda0 ro" with the current code.

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 003d5ab984..ee850f0559 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -230,7 +230,7 @@ static void s390_init(ram_addr_t my_ram_size,
 
     if (kernel_cmdline) {
         cpu_physical_memory_write(KERN_PARM_AREA, kernel_cmdline,
-                                  strlen(kernel_cmdline));
+                                  strlen(kernel_cmdline) + 1);
     }
 
     /* Create VirtIO network adapters */