From: Sasha Levin Date: Wed, 14 Sep 2011 07:24:53 +0000 (+0300) Subject: kvm tools: Don't use i8042 AUX port X-Git-Tag: next-20110915~3^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82927f66c280618ae5a3f843e3aeb79cfc6430d9;p=karo-tx-linux.git kvm tools: Don't use i8042 AUX port We are enabling i8042 even without VNC or SDL so that we could use it's reset method to reboot the guest. AUX port might cause delays during boot. Disable it if the user didn't ask for VNC or SDL. Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 741548f72392..5dafb15b429b 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -736,11 +736,12 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) vidmode = 0; memset(real_cmdline, 0, sizeof(real_cmdline)); - strcpy(real_cmdline, "notsc noapic noacpi pci=conf1 reboot=k panic=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1"); + strcpy(real_cmdline, "notsc noapic noacpi pci=conf1 reboot=k panic=1 i8042.direct=1 " + "i8042.dumbkbd=1 i8042.nopnp=1"); if (vnc || sdl) { strcat(real_cmdline, " video=vesafb console=tty0"); } else - strcat(real_cmdline, " console=ttyS0 earlyprintk=serial"); + strcat(real_cmdline, " console=ttyS0 earlyprintk=serial i8042.noaux=1"); strcat(real_cmdline, " "); if (kernel_cmdline) strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline));