Commit 6c723953 authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Will Deacon
Browse files

builtin-run: Fix console= parameter concatenation

Commit 5857730c

 ("builtin-run: Pass console= parameter based on
active console") adds a console parameter to the kernel command line,
but doesn't account for x86 kvm__arch_set_cmdline populating
real_cmdline without adding a space. Fix the concatenation.
Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 5857730c
......@@ -570,16 +570,16 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
kvm__arch_set_cmdline(real_cmdline, video);
if (video) {
strcat(real_cmdline, "console=tty0");
strcat(real_cmdline, " console=tty0");
} else {
switch (kvm->cfg.active_console) {
case CONSOLE_HV:
/* Fallthrough */
case CONSOLE_VIRTIO:
strcat(real_cmdline, "console=hvc0");
strcat(real_cmdline, " console=hvc0");
break;
case CONSOLE_8250:
strcat(real_cmdline, "console=ttyS0");
strcat(real_cmdline, " console=ttyS0");
break;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment