diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
| commit | fdef621b5810cf8d6715e04d883a0f3523873014 (patch) | |
| tree | e6979f169764792f0ebd75596dd90f454aca4510 /Makefile | |
| parent | cc92186773df8c9aae8f812fff85e7325e1d7583 (diff) | |
| parent | 58c8cce21c13bddd332590fb1fd9a5c369975d3f (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
qemu-iotests: Fix 030 after switch to GenericError
block: Flush parent to OS with cache=unsafe
iscsi: Fix NULL dereferences / races between task completion and abort
monitor: Clean up fd sets on monitor disconnect
block: Enable qemu_open/close to work with fd sets
block: Convert close calls to qemu_close
block: Convert open calls to qemu_open
block: Prevent detection of /dev/fdset/ as floppy
qapi: Introduce add-fd, remove-fd, query-fdsets
qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -148,9 +148,6 @@ install-libcacard: libcacard.la $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,) endif -vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o libcacard/vscclient.o - $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") - ###################################################################### qemu-img.o: qemu-img-cmds.h @@ -166,6 +163,9 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o +vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) $(tools-obj-y) qemu-timer-common.o libcacard/vscclient.o + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") + fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap |