diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-16 12:50:12 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-16 12:50:12 -0500 |
| commit | 8a6b8708e37a4df064aa3b36d7baa786110871f4 (patch) | |
| tree | dbb00258c2a3ec5738801279a1d40ed2f3f8b131 /Makefile.target | |
| parent | e6f5d0be730a41bacb10edba19d1369ec2949486 (diff) | |
| parent | fda1f7684935ae7290c8a31e3ba9fdb30eead4ed (diff) | |
Merge remote-tracking branch 'sstabellini/for_anthony' into staging
* sstabellini/for_anthony:
xen: introduce an event channel for buffered io event notifications
xen-mapcache: don't unmap locked entry during mapcache invalidation
Xen, mapcache: Fix the compute of the size of bucket.
xen: handle backend deletion from xenstore
Xen: Add xen-apic support and hook it up.
Xen: basic HVM MSI injection support.
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 61dfe3b79f..84951a09ec 100644 --- a/Makefile.target +++ b/Makefile.target @@ -239,7 +239,7 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS) obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o obj-$(CONFIG_NO_XEN) += xen-stub.o -obj-i386-$(CONFIG_XEN) += xen_platform.o +obj-i386-$(CONFIG_XEN) += xen_platform.o xen_apic.o # Inter-VM PCI shared memory CONFIG_IVSHMEM = |