From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Fuo-0004Qn-TS for qemu-devel@nongnu.org; Tue, 14 Aug 2012 08:08:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Fum-0006U2-9x for qemu-devel@nongnu.org; Tue, 14 Aug 2012 08:08:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Fum-0006Tu-2e for qemu-devel@nongnu.org; Tue, 14 Aug 2012 08:08:04 -0400 Message-ID: <502A3F99.10500@redhat.com> Date: Tue, 14 Aug 2012 14:07:53 +0200 From: Kevin Wolf MIME-Version: 1.0 References: <1344866929-30456-1-git-send-email-coreyb@linux.vnet.ibm.com> <1344866929-30456-7-git-send-email-coreyb@linux.vnet.ibm.com> In-Reply-To: <1344866929-30456-7-git-send-email-coreyb@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v10 6/7] block: Enable qemu_open/close to work with fd sets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Corey Bryant Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, libvir-list@redhat.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, pbonzini@redhat.com, eblake@redhat.com Am 13.08.2012 16:08, schrieb Corey Bryant: > When qemu_open is passed a filename of the "/dev/fdset/nnn" > format (where nnn is the fdset ID), an fd with matching access > mode flags will be searched for within the specified monitor > fd set. If the fd is found, a dup of the fd will be returned > from qemu_open. > > Signed-off-by: Corey Bryant > cutils.c | 5 +++ > monitor.c | 83 ++++++++++++++++++++++++++++++++++++++++++- > monitor.h | 5 +++ > osdep.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > qemu-common.h | 1 + > qemu-tool.c | 20 +++++++++++ > 6 files changed, 222 insertions(+), 1 deletion(-) This breaks the build of vscclient and the qtest cases, because osdep.c has now a new dependency on the fdset monitor functions. The easy way to fix it would be to squash the following in (linking vscclient and qtests with qemu-tool.o). Any objections? Kevin diff --git a/Makefile b/Makefile index d736ea5..a11a7f4 100644 --- a/Makefile +++ b/Makefile @@ -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): $(tools-obj-y) $(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 $@") + 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 diff --git a/tests/Makefile b/tests/Makefile index f3f4159..26a67ce 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -81,7 +81,7 @@ TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),)) check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) -qtest-obj-y = tests/libqtest.o $(oslib-obj-y) +qtest-obj-y = tests/libqtest.o $(oslib-obj-y) $(tools-obj-y) $(check-qtest-y): $(qtest-obj-y) .PHONY: check-help