From patchwork Thu Nov 4 22:35:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?Q?Llu=C3=ADs?= X-Patchwork-Id: 70182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5A77FB70D5 for ; Fri, 5 Nov 2010 09:47:12 +1100 (EST) Received: from localhost ([127.0.0.1]:40423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PE8YI-00017w-2j for incoming@patchwork.ozlabs.org; Thu, 04 Nov 2010 18:45:02 -0400 Received: from [140.186.70.92] (port=39517 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PE8P1-0004md-6T for qemu-devel@nongnu.org; Thu, 04 Nov 2010 18:35:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PE8Og-0002Xi-6S for qemu-devel@nongnu.org; Thu, 04 Nov 2010 18:35:07 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:51389 helo=mail.gmx.net) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PE8Of-0002XC-Nd for qemu-devel@nongnu.org; Thu, 04 Nov 2010 18:35:06 -0400 Received: (qmail invoked by alias); 04 Nov 2010 22:35:04 -0000 Received: from unknown (EHLO localhost) [84.88.53.92] by mail.gmx.net (mp063) with SMTP; 04 Nov 2010 23:35:04 +0100 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX18OdLYK11EOAJ2/7uDtqUVRYU7cyXLRz/RTxwPgY5 tanS7NiLLh58hJ To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Date: Thu, 04 Nov 2010 23:35:26 +0100 Message-ID: <20101104223526.16669.80998.stgit@ginnungagap.bsc.es> In-Reply-To: <20101104223452.16669.25092.stgit@ginnungagap.bsc.es> References: <20101104223452.16669.25092.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH v2 2/6] backdoor: handle config-time activation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a '--with-backdoor' configuration option pointing to user-provided backdoor callback implementation. Make is invoked on the user-provided directory, which must build a static library containing, at least, the implementation of the backdoor helpers. Signed-off-by: Lluís Vilanova --- Makefile.target | 40 ++++++++++++++++++++++++++++++++++++---- configure | 21 +++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index 91e6e74..da6ee03 100644 --- a/Makefile.target +++ b/Makefile.target @@ -29,7 +29,7 @@ QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF) endif endif -PROGS=$(QEMU_PROG) +PROGS=$(QEMU_PROG)-prepare $(QEMU_PROG) ifndef CONFIG_HAIKU LIBS+=-lm @@ -323,8 +323,40 @@ endif # CONFIG_SOFTMMU obj-y += $(addprefix ../, $(trace-obj-y)) obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o -$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) - $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) + +.PHONY: force +force: + +######################################################### +# backdoor communication channel +ifdef CONFIG_BACKDOOR +VPATH := $(VPATH):$(BACKDOOR_PATH) + +LIBBACKDOOR_LIB = libbackdoor/libbackdoor.a +LIBBACKDOOR_CLEAN = libbackdoor-clean + +libbackdoor/Makefile: + $(call quiet-command, mkdir -p libbackdoor, " CREAT $(TARGET_DIR)$@") + $(call quiet-command, rm -f libbackdoor/Makefile) + $(call quiet-command, ln -s $(BACKDOOR_PATH)/Makefile libbackdoor/Makefile) + +libbackdoor/libbackdoor.a: libbackdoor/Makefile force + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libbackdoor \ + QEMU_CFLAGS="$(QEMU_CFLAGS) -I../target-$(TARGET_BASE_ARCH)" \ + TARGET_DIR=$(TARGET_DIR)libbackdoor/ VPATH=$(VPATH) \ + SRC_PATH=$(SRC_PATH) V="$(V)" libbackdoor.a) + +libbackdoor-clean: + $(MAKE) $(SUBDIR_MAKEFLAGS) -C $(LIBBACKDOOR_DIR) \ + VPATH=$(VPATH) SRC_PATH=$(SRC_PATH) V="$(V)" clean || true +endif + + + +$(QEMU_PROG)-prepare: $(GENERATED_HEADERS) $(LIBBACKDOOR_LIB) $(QEMU_PROG) + +$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(LIBBACKDOOR_LIB) + $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) $(LIBBACKDOOR_LIB) gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/feature_to_c.sh @@ -336,7 +368,7 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx qmp-commands.h: $(SRC_PATH)/qmp-commands.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") -clean: +clean: $(LIBBACKDOOR_CLEAN) rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.d */*.d tcg/*.o ide/*.o rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c diff --git a/configure b/configure index 7025d2b..e6fbf97 100755 --- a/configure +++ b/configure @@ -332,6 +332,7 @@ zero_malloc="" trace_backend="nop" trace_file="trace" spice="" +backdoor="" # OS specific if check_define __linux__ ; then @@ -741,6 +742,17 @@ for opt do ;; --*dir) ;; + --with-backdoor=*) backdoor="$optarg" + if test ! -f "$backdoor/Makefile"; then + echo + echo "Error: cannot make into '$backdoor'" + echo "Please choose a directory where I can run 'make'" + echo + exit 1 + else + backdoor=`readlink -f $backdoor` + fi + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -2338,6 +2350,9 @@ echo "vhost-net support $vhost_net" echo "Trace backend $trace_backend" echo "Trace output file $trace_file-" echo "spice support $spice" +if test -n "$backdoor"; then + echo "Backdoor comm. $backdoor" +fi if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -2601,6 +2616,12 @@ if test "$spice" = "yes" ; then echo "CONFIG_SPICE=y" >> $config_host_mak fi +if test -n "$backdoor"; then + echo "CONFIG_BACKDOOR=y" >> $config_host_mak + echo "BACKDOOR_PATH=$backdoor" >> $config_host_mak + rm -rf *-{bsd-usr,darwin-user,linux-user,softmmu}/libbackdoor/ +fi + # XXX: suppress that if [ "$bsd" = "yes" ] ; then echo "CONFIG_BSD=y" >> $config_host_mak