From patchwork Mon Sep 3 09:18:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 181341 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 C354E2C0091 for ; Mon, 3 Sep 2012 19:23:08 +1000 (EST) Received: from localhost ([::1]:46758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8Ss6-0006Bl-SK for incoming@patchwork.ozlabs.org; Mon, 03 Sep 2012 05:23:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8Sr7-000458-Cf for qemu-devel@nongnu.org; Mon, 03 Sep 2012 05:22:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T8Sqy-0007oe-Tt for qemu-devel@nongnu.org; Mon, 03 Sep 2012 05:22:05 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:51031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8Sqy-0007oQ-3D for qemu-devel@nongnu.org; Mon, 03 Sep 2012 05:21:56 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 3 Sep 2012 19:20:53 +1000 Received: from d23relay04.au.ibm.com (202.81.31.246) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 3 Sep 2012 19:20:51 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q839Cs5d24051920 for ; Mon, 3 Sep 2012 19:12:54 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q839Lo8V018552 for ; Mon, 3 Sep 2012 19:21:51 +1000 Received: from RedHat62GAWSWenchao ([9.115.122.34]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q839JI4m012127; Mon, 3 Sep 2012 19:21:49 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 3 Sep 2012 17:18:46 +0800 Message-Id: <1346663926-20188-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1346663926-20188-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1346663926-20188-1-git-send-email-xiawenc@linux.vnet.ibm.com> x-cbid: 12090309-7014-0000-0000-000001D4AFF8 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.148 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, pbonzini@redhat.com, eblake@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 6/6] libqblock building 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 non PIC and PIC ones in ./libqblock. Test cases are placed under tests/libqblock/. Signed-off-by: Wenchao Xia --- Makefile | 22 +++++++++++++++- Makefile.objs | 6 ++++ libqblock/Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile | 3 ++ tests/libqblock/Makefile | 28 ++++++++++++++++++++ 5 files changed, 120 insertions(+), 1 deletions(-) create mode 100644 libqblock/Makefile create mode 100644 tests/libqblock/Makefile diff --git a/Makefile b/Makefile index 1cd5bc8..9f3c0a0 100644 --- a/Makefile +++ b/Makefile @@ -163,6 +163,25 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o +###################################################################### +# Support building shared library libqblock + +.PHONY: libqblock.la +ifeq ($(LIBTOOL),) +$(libqblock-lib-la): + @echo "libtool is missing, please install and rerun configure"; exit 1 +else +$(libqblock-lib-la): + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libqblock V="$(V)" TARGET_DIR="$*/" $(libqblock-lib-la),) +endif + +#make native test file instead of libtool, as a test for development +QEMU_CFLAGS+=-I./libqblock +libqblock-objs=libqblock/libqblock.o libqblock/libqblock-helper.o libqblock/libqblock-error.o +libqblock-test-native$(EXESUF): $(libqblock-objs) tests/libqblock/libqblock-test.o $(tools-obj-y) $(block-obj-y) + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)," LINK $@") +########################################################################### + 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 $@") @@ -226,7 +245,8 @@ clean: rm -rf qapi-generated rm -rf qga/qapi-generated $(MAKE) -C tests/tcg clean - for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ + $(MAKE) -C tests/libqblock clean + 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/Makefile.objs b/Makefile.objs index 4412757..8a4c9fc 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -248,3 +248,9 @@ nested-vars += \ common-obj-y \ extra-obj-y dummy := $(call unnest-vars) + +############################################################################# +# libqblock + +libqblock-lib-la = libqblock.la +libqblock-lib-path = libqblock diff --git a/libqblock/Makefile b/libqblock/Makefile new file mode 100644 index 0000000..5f16000 --- /dev/null +++ b/libqblock/Makefile @@ -0,0 +1,62 @@ +########################################################################### +# 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-helper.o libqblock-error.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) + +################################################################# +# 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 + +#make dir block at runtime which would hold the output of block/*.c +block: + @mkdir block + +ifeq ($(LIBTOOL),) +$(libqblock-lib-la): + @echo "libtool is missing, please install and rerun configure"; exit 1 +else +$(libqblock-lib-la): $(libqblock-lib-y) $(QEMU_OBJS_LIB) + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(LIBS)," lt LINK $@") +endif + +.PHONY: libqblock.la diff --git a/tests/Makefile b/tests/Makefile index 26a67ce..69af1e2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -148,4 +148,7 @@ check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-unit check-qtest +check-libqblock: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C tests/libqblock V="$(V)" TARGET_DIR="$*/" check-libqblock,) + -include $(wildcard tests/*.d) diff --git a/tests/libqblock/Makefile b/tests/libqblock/Makefile new file mode 100644 index 0000000..4b4da2f --- /dev/null +++ b/tests/libqblock/Makefile @@ -0,0 +1,28 @@ +-include ../../config-host.mak +-include $(SRC_PATH)/Makefile.objs +-include $(SRC_PATH)/rules.mak + +$(call set-vpath, $(SRC_PATH)) + +#library test case objects +libqblock-test-objs=libqblock-test.lo + +QEMU_CFLAGS+=-I $(SRC_PATH)/$(libqblock-lib-path) +libqblock-la-path = $(SRC_PATH)/$(libqblock-lib-path)/$(libqblock-lib-la) + +########################################################################## +#runtime rules: +ifeq ($(LIBTOOL),) +libqblock-test.bin: + @echo "libtool is missing, please install and rerun configure"; exit 1 +else +libqblock-test.bin: $(libqblock-test-objs) + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -shared -rpath $(libdir) -o $@ $^ $(libqblock-la-path)," lt LINK $@") +endif + +check-libqblock: libqblock-test.bin + ./libqblock-test.bin + +clean: + rm -f *.lo *.o *.d *.la *.bin + rm -rf .libs