From 57d7832be7ce0e84573469c8630c2ebb824c2467 Mon Sep 17 00:00:00 2001 From: Matt Evans Date: Fri, 9 Dec 2011 17:52:35 +1100 Subject: [PATCH] kvm tools: Only build/init i8042 on x86 Not every architecture has an i8042 kbd controller, so only use this when building for x86. Signed-off-by: Matt Evans Signed-off-by: Pekka Enberg --- Makefile | 2 +- builtin-run.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 243886e..f58a1d8 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,6 @@ OBJS += util/strbuf.o OBJS += virtio/9p.o OBJS += virtio/9p-pdu.o OBJS += hw/vesa.o -OBJS += hw/i8042.o OBJS += hw/pci-shmem.o OBJS += kvm-ipc.o @@ -153,6 +152,7 @@ ifeq ($(ARCH),x86) OBJS += x86/kvm.o OBJS += x86/kvm-cpu.o OBJS += x86/mptable.o + OBJS += hw/i8042.o # Exclude BIOS object files from header dependencies. OTHEROBJS += x86/bios.o OTHEROBJS += x86/bios/bios-rom.o diff --git a/builtin-run.c b/builtin-run.c index d5abeb4..e273398 100644 --- a/builtin-run.c +++ b/builtin-run.c @@ -943,7 +943,9 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) kvm__init_ram(kvm); +#ifdef CONFIG_X86 kbd__init(kvm); +#endif pci_shmem__init(kvm);