diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-13 09:25:48 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-13 09:25:48 -0500 |
| commit | d517872ec289f5bfa6bd9f385a90e09483e9949c (patch) | |
| tree | da187195eaa2e0c9c6102f5afa3435d4ab1ffd3f /target-i386/Makefile.objs | |
| parent | 33e95c6328a3149a52615176617997c4f8f7088b (diff) | |
| parent | 96fda35ac477e954eee989d6a3ae9e686cc361d6 (diff) | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
kvm: Add documentation comment for kvm_irqchip_in_kernel()
kvm: Decouple 'GSI routing' from 'kernel irqchip'
kvm: Decouple 'MSI routing via irqfds' from 'kernel irqchip'
kvm: Decouple 'irqfds usable' from 'kernel irqchip'
kvm: Move kvm_allows_irq0_override() to target-i386, fix return type
kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq()
kvm: Decouple 'async interrupt delivery' from 'kernel irqchip'
configure: Don't implicitly hardcode list of KVM architectures
kvm: Check if smp_cpus exceeds max cpus supported by kvm
Diffstat (limited to 'target-i386/Makefile.objs')
| -rw-r--r-- | target-i386/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs index 683fd59af9..0715f58a8e 100644 --- a/target-i386/Makefile.objs +++ b/target-i386/Makefile.objs @@ -3,6 +3,7 @@ obj-y += excp_helper.o fpu_helper.o cc_helper.o int_helper.o svm_helper.o obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o obj-$(CONFIG_KVM) += kvm.o hyperv.o +obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-$(CONFIG_LINUX_USER) += ioport-user.o obj-$(CONFIG_BSD_USER) += ioport-user.o |