From: Sasha Levin <levinsasha928@gmail.com>
To: penberg@kernel.org
Cc: kvm@vger.kernel.org, mingo@elte.hu, gorcunov@gmail.com,
asias.hejun@gmail.com, Sasha Levin <levinsasha928@gmail.com>
Subject: [PATCH 3/5] kvm tools: Attach default 'root=' only if required
Date: Tue, 6 Sep 2011 02:23:53 +0300 [thread overview]
Message-ID: <1315265035-9496-3-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1315265035-9496-1-git-send-email-levinsasha928@gmail.com>
This patch fixes a case where the 'root=' parameter was passed twice
when using virtio-9p root mode.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
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
next prev parent reply other threads:[~2011-09-05 23:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-05 23:23 [PATCH 1/5] kvm tools: Remove unconditional warning in ivshmem Sasha Levin
2011-09-05 23:23 ` [PATCH 2/5] kvm tools: Fix 32bit warnings Sasha Levin
2011-09-05 23:23 ` Sasha Levin [this message]
2011-09-05 23:23 ` [PATCH 4/5] kvm tools: Teach 'run' to handle guestfs Sasha Levin
2011-09-06 13:37 ` Cyrill Gorcunov
2011-09-05 23:23 ` [PATCH 5/5] kvm tools: Add guestfs network autoconfiguration Sasha Levin
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=1315265035-9496-3-git-send-email-levinsasha928@gmail.com \
--to=levinsasha928@gmail.com \
--cc=asias.hejun@gmail.com \
--cc=gorcunov@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=penberg@kernel.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