aboutsummaryrefslogtreecommitdiffstats
path: root/x86
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2017-10-25 17:10:22 +0100
committerWill Deacon <will.deacon@arm.com>2017-10-25 17:10:22 +0100
commit5857730ceee5980e482807afc922e758cbeaa921 (patch)
tree65abb2c64dca98c79e0db5c2f5afe9c8d402e9f7 /x86
parent83042d1e6ce625d2fb80c3d2059e29c3d3c608fe (diff)
downloadkvmtool-5857730ceee5980e482807afc922e758cbeaa921.tar.gz
builtin-run: Pass console= parameter based on active console
x86 already does this in the backend, but doing it in the generic code means that it is possible to boot a defconfig arm64 kernel under kvmtool without having to specify any additional parameters at all. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'x86')
-rw-r--r--x86/kvm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/x86/kvm.c b/x86/kvm.c
index bfa04b81..d8751e9a 100644
--- a/x86/kvm.c
+++ b/x86/kvm.c
@@ -124,9 +124,9 @@ void kvm__arch_set_cmdline(char *cmdline, bool video)
strcpy(cmdline, "noapic noacpi pci=conf1 reboot=k panic=1 i8042.direct=1 "
"i8042.dumbkbd=1 i8042.nopnp=1");
if (video)
- strcat(cmdline, " video=vesafb console=tty0");
+ strcat(cmdline, " video=vesafb");
else
- strcat(cmdline, " console=ttyS0 earlyprintk=serial i8042.noaux=1");
+ strcat(cmdline, " earlyprintk=serial i8042.noaux=1");
}
/* Architecture-specific KVM init */