From patchwork Wed Aug 29 11:05:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 180685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1C7D82C00BA for ; Wed, 29 Aug 2012 21:06:26 +1000 (EST) Received: from localhost ([::1]:60589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6g6K-00083X-5h for incoming@patchwork.ozlabs.org; Wed, 29 Aug 2012 07:06:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6g67-0007k9-0y for qemu-devel@nongnu.org; Wed, 29 Aug 2012 07:06:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6g61-0007s1-Qa for qemu-devel@nongnu.org; Wed, 29 Aug 2012 07:06:10 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:54712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6g61-0007qG-8A for qemu-devel@nongnu.org; Wed, 29 Aug 2012 07:06:05 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 29 Aug 2012 21:04:53 +1000 Received: from d23relay04.au.ibm.com (202.81.31.246) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 29 Aug 2012 21:04:50 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7TAv9NL25952448 for ; Wed, 29 Aug 2012 20:57:09 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7TB5x0T007831 for ; Wed, 29 Aug 2012 21:06:00 +1000 Received: from RedHat62GAWSWenchao (wenchaox.cn.ibm.com [9.115.122.69]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7TB5thC007793; Wed, 29 Aug 2012 21:05:57 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 29 Aug 2012 19:05:59 +0800 Message-Id: <1346238359-24653-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 x-cbid: 12082911-5490-0000-0000-0000020AC3F1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.144 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, Wenchao Xia , blauwirbel@gmail.com, pbonzini@redhat.com, eblake@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v3 5/5] [RFC] libqblock, build system X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org libqblock was placed in new directory ./libqblock, libtool will build dynamic library there, source files of block layer remains in ./block. So block related source code will generate 3 sets of binary, first is old ones used in qemu, second and third are on PIC and PIC ones in ./libqblock. Signed-off-by: Wenchao Xia --- Makefile | 23 +++++++++++++++- libqblock/Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-) create mode 100644 libqblock/Makefile diff --git a/Makefile b/Makefile index 621cb86..942ec49 100644 --- a/Makefile +++ b/Makefile @@ -169,6 +169,27 @@ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o 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 +###################################################################### +# Support building shared library libqblock + +.PHONY: libqblock.la +ifeq ($(LIBTOOL),) +libqblock.la: + @echo "libtool is missing, please install and rerun configure"; exit 1 +else +libqblock.la: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libqblock V="$(V)" TARGET_DIR="$*/" libqblock.la,) +libqblock-test: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libqblock V="$(V)" TARGET_DIR="$*/" libqblock-test,) +libqblock-test-static: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libqblock V="$(V)" TARGET_DIR="$*/" libqblock-test-static,) +endif + +#make native test file instead of libtool +libqblock-test-native$(EXESUF): libqblock/libqblock.o libqblock/libqblock-test.o $(tools-obj-y) $(block-obj-y) + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)," LINK $@") + +######################################################################## qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") @@ -227,7 +248,7 @@ clean: rm -rf qapi-generated rm -rf qga/qapi-generated $(MAKE) -C tests/tcg clean - for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ + for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard libqblock; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ rm -f $$d/qemu-options.def; \ done diff --git a/libqblock/Makefile b/libqblock/Makefile new file mode 100644 index 0000000..5b0aecb --- /dev/null +++ b/libqblock/Makefile @@ -0,0 +1,74 @@ +########################################################################### +# libqblock Makefile +# Todo: +# 1 trace related files is generated in this directory, move +# them to the root directory. +########################################################################## +-include ../config-host.mak +-include $(SRC_PATH)/Makefile.objs +-include $(SRC_PATH)/rules.mak + +############################################################################# +# Library settings +############################################################################# +$(call set-vpath, $(SRC_PATH)) + +#expand the foldered vars,especially ./block +dummy := $(call unnest-vars-1) + +#library objects +tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \ + qemu-timer-common.o main-loop.o notify.o \ + iohandler.o cutils.o iov.o async.o +tools-obj-$(CONFIG_POSIX) += compatfd.o + +libqblock-y=libqblock.o +libqblock.lib-y=$(patsubst %.o,%.lo,$(libqblock-y)) + +QEMU_OBJS=$(tools-obj-y) $(block-obj-y) +QEMU_OBJS_FILTERED=$(filter %.o,$(QEMU_OBJS)) +QEMU_OBJS_LIB=$(patsubst %.o, %.lo,$(QEMU_OBJS_FILTERED)) + +QEMU_CFLAGS+=-I../ -I../include + +#dependency libraries +LIBS+=-lz $(LIBS_TOOLS) + +#library test case objects +libqblock-test-objs=libqblock-test.lo + + + +################################################################# +# Runtime rules +################################################################# +clean: + rm -f *.lo *.o *.d *.la libqblock-test trace.c trace.c-timestamp + rm -rf .libs block trace + +all: libqblock-test + @true + +help: + @echo type make libqblock-test at root dirtory, libtool is required + +ifeq ($(LIBTOOL),) +libqblock.la: + @echo "libtool is missing, please install and rerun configure"; exit 1 +else +#make dir block at runtime which would hold the output of block/*.c +block: + @mkdir block + +libqblock.la: $(libqblock.lib-y) $(QEMU_OBJS_LIB) + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(LIBS)," lt LINK $@") + +libqblock-test: $(libqblock-test-objs) libqblock.la + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -shared -rpath $(libdir) -o $@ $^," lt LINK $@") + +libqblock-test-static: $(libqblock-test-objs) $(libqblock.lib-y) $(QEMU_OBJS_LIB) + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -o $@ $^ $(LIBS)," lt LINK $@") + +.PHONY: libqblock.la liqblock-test + +endif