summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-28 11:51:32 +0000
committerMark McLoughlin <markmc@redhat.com>2009-10-28 11:52:42 +0000
commit4c3bad2f638cebe70864952a054ebeed6327daee (patch)
treee3bfa75a5f567befc3a7b7ba96d03bcfe98398c4 /Makefile.target
parentMerge commit '8febfa26846e75d38848255028dfe2d06e5ba941' into upstream-merge (diff)
parentnet: make tap_receive() re-use tap_receive_iov() code (diff)
downloadqemu-kvm-4c3bad2f638cebe70864952a054ebeed6327daee.tar.gz
qemu-kvm-4c3bad2f638cebe70864952a054ebeed6327daee.tar.bz2
qemu-kvm-4c3bad2f638cebe70864952a054ebeed6327daee.zip
Merge commit '38c75be3139a117b02350dbda9d48d47aa57fa3d' into upstream-merge
* commit '38c75be3139a117b02350dbda9d48d47aa57fa3d': net: make tap_receive() re-use tap_receive_iov() code net: import linux tap ioctl definitions net: remove unused includes of if_tun.h and if_tap.h Revert "qcow2: Bring synchronous read/write back to life" linux-aio: Honour AsyncContext posix-aio-compat: Honour AsyncContext block: Use new AsyncContext for bdrv_read/write emulation Introduce contexts for asynchronous callbacks Split out bottom halves Conflicts: net.c Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index b607f7105..9e7481efb 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -166,7 +166,7 @@ endif #CONFIG_BSD_USER
# System emulator target
ifdef CONFIG_SOFTMMU
-obj-y = vl.o monitor.o pci.o machine.o gdbstub.o
+obj-y = vl.o async.o monitor.o pci.o machine.o gdbstub.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o