Commit-ID: 73f3e784be5ba4c4f1df5e88a455faeedc4a626e Gitweb: http://git.kernel.org/tip/73f3e784be5ba4c4f1df5e88a455faeedc4a626e Author: Matt Evans <matt@xxxxxxxxxx> AuthorDate: Fri, 9 Dec 2011 17:52:35 +1100 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Fri, 9 Dec 2011 13:48:06 +0200 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 <matt@xxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/Makefile | 2 +- tools/kvm/builtin-run.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 243886e..f58a1d8 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/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/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index d5abeb4..e273398 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|