From patchwork Fri Nov 11 17:49:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 125257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 439A11007D8 for ; Sat, 12 Nov 2011 05:26:46 +1100 (EST) Received: from localhost ([::1]:40579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROvEe-000757-8x for incoming@patchwork.ozlabs.org; Fri, 11 Nov 2011 12:49:52 -0500 Received: from eggs.gnu.org ([140.186.70.92]:55234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROvE1-00058n-RA for qemu-devel@nongnu.org; Fri, 11 Nov 2011 12:49:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROvDt-0002m5-QX for qemu-devel@nongnu.org; Fri, 11 Nov 2011 12:49:13 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45061 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROvDt-0002lF-Dg for qemu-devel@nongnu.org; Fri, 11 Nov 2011 12:49:05 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 2AE3A8EE5B; Fri, 11 Nov 2011 18:49:04 +0100 (CET) From: Alexander Graf To: qemu-devel Developers Date: Fri, 11 Nov 2011 18:49:18 +0100 Message-Id: <1321033763-19881-12-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1321033763-19881-1-git-send-email-agraf@suse.de> References: <1321033763-19881-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com, Christian Borntraeger Subject: [Qemu-devel] [PATCH 11/16] s390: fix short kernel command lines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Christian Borntraeger 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 Signed-off-by: Alexander Graf --- 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 */