From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH 3/5] kvm tools: Attach default 'root=' only if required Date: Tue, 6 Sep 2011 02:23:53 +0300 Message-ID: <1315265035-9496-3-git-send-email-levinsasha928@gmail.com> References: <1315265035-9496-1-git-send-email-levinsasha928@gmail.com> Cc: kvm@vger.kernel.org, mingo@elte.hu, gorcunov@gmail.com, asias.hejun@gmail.com, Sasha Levin To: penberg@kernel.org Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:37182 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732Ab1IEXY1 (ORCPT ); Mon, 5 Sep 2011 19:24:27 -0400 Received: by mail-wy0-f174.google.com with SMTP id 22so3972804wyh.19 for ; Mon, 05 Sep 2011 16:24:27 -0700 (PDT) In-Reply-To: <1315265035-9496-1-git-send-email-levinsasha928@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: This patch fixes a case where the 'root=' parameter was passed twice when using virtio-9p root mode. Signed-off-by: Sasha Levin --- tools/kvm/builtin-run.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index b9efde2..ef1a358 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -739,11 +739,10 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) strlcat(real_cmdline, " init=/bin/sh ", sizeof(real_cmdline)); } - if (!strstr(real_cmdline, "root=")) - strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline)); - if (using_rootfs) - strcat(real_cmdline, " root=/dev/root rootflags=rw,trans=virtio,version=9p2000.L rootfstype=9p"); + strcat(real_cmdline, " root=/dev/root rw rootflags=rw,trans=virtio,version=9p2000.L rootfstype=9p"); + else if (!strstr(real_cmdline, "root=")) + strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline)); if (image_count) { kvm->nr_disks = image_count; -- 1.7.6.1