From: Alexandru Elisei <alexandru.elisei@arm.com>
To: will@kernel.org, julien.thierry.kdev@gmail.com, kvm@vger.kernel.org
Cc: christoffer.dall@arm.com, vivek.gautam@arm.com
Subject: [PATCH kvmtool 06/10] builtin-run: Move kernel command line generation to a separate function
Date: Thu, 23 Sep 2021 15:45:01 +0100 [thread overview]
Message-ID: <20210923144505.60776-7-alexandru.elisei@arm.com> (raw)
In-Reply-To: <20210923144505.60776-1-alexandru.elisei@arm.com>
The real kernel command line is gradually generated in kvm_cmd_run_init()
and it is interspersed with the initialization code. This means that both
the code that generates the command line and the rest of the code is
unnecessarily difficult to follow and to modify. Move the code that
generates the command line to one function, to make it easier to
understand, and to declutter kvm_cmd_run_init().
No functional change intended.
Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
---
builtin-run.c | 100 +++++++++++++++++++++++++++-----------------------
1 file changed, 54 insertions(+), 46 deletions(-)
diff --git a/builtin-run.c b/builtin-run.c
index 6822c321883e..478b5a95b726 100644
--- a/builtin-run.c
+++ b/builtin-run.c
@@ -455,6 +455,54 @@ static void kvm_run_write_sandbox_cmd(struct kvm *kvm, const char **argv, int ar
close(fd);
}
+static void kvm_run_set_real_cmdline(struct kvm *kvm)
+{
+ static char real_cmdline[2048];
+ bool video;
+
+ video = kvm->cfg.vnc || kvm->cfg.sdl || kvm->cfg.gtk;
+
+ memset(real_cmdline, 0, sizeof(real_cmdline));
+ kvm__arch_set_cmdline(real_cmdline, video);
+
+ if (video) {
+ strcat(real_cmdline, " console=tty0");
+ } else {
+ switch (kvm->cfg.active_console) {
+ case CONSOLE_HV:
+ /* Fallthrough */
+ case CONSOLE_VIRTIO:
+ strcat(real_cmdline, " console=hvc0");
+ break;
+ case CONSOLE_8250:
+ strcat(real_cmdline, " console=ttyS0");
+ break;
+ }
+ }
+
+ if (kvm->cfg.using_rootfs) {
+ strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p");
+ if (kvm->cfg.custom_rootfs) {
+#ifdef CONFIG_GUEST_PRE_INIT
+ strcat(real_cmdline, " init=/virt/pre_init");
+#else
+ strcat(real_cmdline, " init=/virt/init");
+#endif
+ if (!kvm->cfg.no_dhcp)
+ strcat(real_cmdline, " ip=dhcp");
+ }
+ } else if (!kvm->cfg.kernel_cmdline || !strstr(kvm->cfg.kernel_cmdline, "root=")) {
+ strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline));
+ }
+
+ if (kvm->cfg.kernel_cmdline) {
+ strcat(real_cmdline, " ");
+ strlcat(real_cmdline, kvm->cfg.kernel_cmdline, sizeof(real_cmdline));
+ }
+
+ kvm->cfg.real_cmdline = real_cmdline;
+}
+
static void kvm_run_validate_cfg(struct kvm *kvm)
{
if (kvm->cfg.kernel_filename && kvm->cfg.firmware_filename)
@@ -470,10 +518,9 @@ static void kvm_run_validate_cfg(struct kvm *kvm)
static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
{
- static char real_cmdline[2048], default_name[20];
+ static char default_name[20];
unsigned int nr_online_cpus;
struct kvm *kvm = kvm__new();
- bool video;
if (IS_ERR(kvm))
return kvm;
@@ -586,26 +633,6 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
if (!kvm->cfg.network)
kvm->cfg.network = DEFAULT_NETWORK;
- video = kvm->cfg.vnc || kvm->cfg.sdl || kvm->cfg.gtk;
-
- memset(real_cmdline, 0, sizeof(real_cmdline));
- kvm__arch_set_cmdline(real_cmdline, video);
-
- if (video) {
- strcat(real_cmdline, " console=tty0");
- } else {
- switch (kvm->cfg.active_console) {
- case CONSOLE_HV:
- /* Fallthrough */
- case CONSOLE_VIRTIO:
- strcat(real_cmdline, " console=hvc0");
- break;
- case CONSOLE_8250:
- strcat(real_cmdline, " console=ttyS0");
- break;
- }
- }
-
if (!kvm->cfg.guest_name) {
if (kvm->cfg.custom_rootfs) {
kvm->cfg.guest_name = kvm->cfg.custom_rootfs_name;
@@ -629,32 +656,13 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
kvm->cfg.using_rootfs = kvm->cfg.custom_rootfs = 1;
}
- if (kvm->cfg.using_rootfs) {
- strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p");
- if (kvm->cfg.custom_rootfs) {
- kvm_run_set_sandbox(kvm);
-
-#ifdef CONFIG_GUEST_PRE_INIT
- strcat(real_cmdline, " init=/virt/pre_init");
-#else
- strcat(real_cmdline, " init=/virt/init");
-#endif
-
- if (!kvm->cfg.no_dhcp)
- strcat(real_cmdline, " ip=dhcp");
- if (kvm_setup_guest_init(kvm->cfg.custom_rootfs_name))
- die("Failed to setup init for guest.");
- }
- } else if (!kvm->cfg.kernel_cmdline || !strstr(kvm->cfg.kernel_cmdline, "root=")) {
- strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline));
- }
-
- if (kvm->cfg.kernel_cmdline) {
- strcat(real_cmdline, " ");
- strlcat(real_cmdline, kvm->cfg.kernel_cmdline, sizeof(real_cmdline));
+ if (kvm->cfg.custom_rootfs) {
+ kvm_run_set_sandbox(kvm);
+ if (kvm_setup_guest_init(kvm->cfg.custom_rootfs_name))
+ die("Failed to setup init for guest.");
}
- kvm->cfg.real_cmdline = real_cmdline;
+ kvm_run_set_real_cmdline(kvm);
if (kvm->cfg.kernel_filename) {
printf(" # %s run -k %s -m %Lu -c %d --name %s\n", KVM_BINARY_NAME,
--
2.31.1
next prev parent reply other threads:[~2021-09-23 14:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 14:44 [PATCH kvmtool 00/10] Run kvm-unit-tests with --kernel Alexandru Elisei
2021-09-23 14:44 ` [PATCH kvmtool 01/10] builtin-run: Treat specifying both --kernel and --firmware as an error Alexandru Elisei
2021-09-23 14:44 ` [PATCH kvmtool 02/10] builtin-run: Warn when ignoring initrd because --firmware was specified Alexandru Elisei
2021-09-23 14:44 ` [PATCH kvmtool 03/10] builtin-run: Do not attempt to find vmlinux if --firmware Alexandru Elisei
2021-09-23 14:44 ` [PATCH kvmtool 04/10] builtin-run: Abstract argument validation into a separate function Alexandru Elisei
2021-09-23 14:45 ` [PATCH kvmtool 05/10] Use kvm->nr_disks instead of kvm->cfg.image_count Alexandru Elisei
2021-09-23 14:45 ` Alexandru Elisei [this message]
2021-09-23 14:45 ` [PATCH kvmtool 07/10] Add --nodefaults command line argument Alexandru Elisei
2021-09-23 14:45 ` [PATCH kvmtool 08/10] Add --nocompat option to disable compat warnings Alexandru Elisei
2021-10-12 8:34 ` Will Deacon
2021-10-12 14:24 ` Alexandru Elisei
2021-09-23 14:45 ` [PATCH kvmtool 09/10] arm64: Use the default offset when the kernel image magic is not found Alexandru Elisei
2021-09-23 14:45 ` [PATCH kvmtool 10/10] arm64: Be more permissive when parsing the kernel header Alexandru Elisei
2021-10-12 8:46 ` [PATCH kvmtool 00/10] Run kvm-unit-tests with --kernel Will Deacon
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=20210923144505.60776-7-alexandru.elisei@arm.com \
--to=alexandru.elisei@arm.com \
--cc=christoffer.dall@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=vivek.gautam@arm.com \
--cc=will@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.