diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-01 15:26:01 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-01 15:26:01 -0600 |
| commit | 5918ff68ff3ffe61ae8ebff5b031d6bdcc63c6bc (patch) | |
| tree | 0c24b8b7937f1d9ea0322fa5e795789794714fbc /Makefile.target | |
| parent | 7c51c1aa03a52b9fd75ed1ade2e65d079ae4d50e (diff) | |
| parent | 5b6fb069378e61c45c577bbec3d7ef60367f7e4c (diff) | |
| download | qemu-5918ff68ff3ffe61ae8ebff5b031d6bdcc63c6bc.tar.gz | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
pc-bios: update kvmvapic.bin
kvmvapic: Use optionrom helpers
optionsrom: Reserve space for checksum
kvmvapic: Simplify mp/up_set_tpr
kvmvapic: Introduce TPR access optimization for Windows guests
kvmvapic: Add option ROM
target-i386: Add infrastructure for reporting TPR MMIO accesses
Allow to use pause_all_vcpus from VCPU context
Process pending work while waiting for initial kick-off in TCG mode
Remove useless casts from cpu iterators
kvm: Set cpu_single_env only once
kvm: Synchronize cpu state in kvm_arch_stop_on_emulation_error()
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 68a5641183..692c9d78a6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -237,7 +237,8 @@ obj-y += device-hotplug.o # Hardware support obj-i386-y += mc146818rtc.o pc.o -obj-i386-y += sga.o apic_common.o apic.o ioapic_common.o ioapic.o piix_pci.o +obj-i386-y += apic_common.o apic.o kvmvapic.o +obj-i386-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-i386-y += vmport.o obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o |