diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 20:04:14 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 20:04:14 -0200 |
| commit | c4dd40541cda848283ce7ae39c3467fb1d993329 (patch) | |
| tree | 189264bb1059a8be3bc73e7e378e55c84e1a8526 /Makefile | |
| parent | 8acab442bf67c1473bb020e2d65b685fee9f1934 (diff) | |
| parent | 3e39789b64b01444b6377a043894e6b9a3ba6cbb (diff) | |
Merge commit '3e39789b64b01444b6377a043894e6b9a3ba6cbb' into upstream-merge
* commit '3e39789b64b01444b6377a043894e6b9a3ba6cbb':
Revert "block: prevent multiwrite_merge from creating too large iovecs"
make: qemu-img depends on config-host.h
reduce number of reinjects on ACK
block: prevent multiwrite_merge from creating too large iovecs
block: fix cache flushing in bdrv_commit
QMP: Fix asynchronous events delivery
vnc: Use inet_strfamily()
net: inet_strfamily(): Better unknown family report
net: Make inet_strfamily() public
virtio-serial: Use MSI vectors for port virtqueues
Move virtio-serial to Makefile.objs
virtio-serial: Add a 'virtserialport' device for generic serial port support
virtio-serial-bus: Add ability to hot-unplug ports
virtio-serial-bus: Add a port 'name' property for port discovery in guests
virtio-serial-bus: Maintain guest and host port open/close state
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -138,7 +138,7 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) ###################################################################### -qemu-img.o: qemu-img-cmds.h +qemu-img.o: qemu-img-cmds.h config-host.h obj-y = qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) |