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 <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 741548f723924f117b4a5998b5816e68406bde86..5dafb15b429b6550acdcf29fab5ea82666218a23 100644 (file)
--- 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));