qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: qemu-devel Developers <qemu-devel@nongnu.org>
Cc: blauwirbel@gmail.com, Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [Qemu-devel] [PATCH 07/12] s390: fix short kernel command lines
Date: Mon, 14 Nov 2011 18:06:35 +0100	[thread overview]
Message-ID: <1321290400-32717-8-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1321290400-32717-1-git-send-email-agraf@suse.de>

From: Christian Borntraeger <borntraeger@de.ibm.com>

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>
---
 hw/s390-virtio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 003d5ab..ee850f0 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 */
-- 
1.6.0.2

  parent reply	other threads:[~2011-11-14 17:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-14 17:06 [Qemu-devel] [PULL 00/12] s390 patch queue 2011-11-14 1.0 Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 01/12] s390x: add ldeb instruction Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 02/12] s390x: make ipte 31-bit aware Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 03/12] s390x: update R and C bits in storage key Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 04/12] s390x: implement rrbe instruction properly Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 05/12] s390x: implement SIGP restart and shutdown Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 06/12] s390: fix reset hypercall to reset the status Alexander Graf
2011-11-14 17:06 ` Alexander Graf [this message]
2011-11-14 17:06 ` [Qemu-devel] [PATCH 08/12] s390: Fix cpu shutdown for KVM Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 09/12] s390x: Add shutdown for TCG s390-virtio machine Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 10/12] tcg: Standardize on TCGReg as the enum for hard registers Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 11/12] tcg: Use TCGReg for standard tcg-target entry points Alexander Graf
2011-11-14 17:06 ` [Qemu-devel] [PATCH 12/12] s390x: initialize virtio dev region Alexander Graf
2011-11-19 13:58 ` [Qemu-devel] [PULL 00/12] s390 patch queue 2011-11-14 1.0 Blue Swirl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1321290400-32717-8-git-send-email-agraf@suse.de \
    --to=agraf@suse.de \
    --cc=blauwirbel@gmail.com \
    --cc=borntraeger@de.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).