From patchwork Mon Oct 15 03:13:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 191456 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 BD7932C0098 for ; Mon, 15 Oct 2012 14:16:48 +1100 (EST) Received: from localhost ([::1]:40473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNbAc-00023D-TQ for incoming@patchwork.ozlabs.org; Sun, 14 Oct 2012 23:16:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNbAV-000234-97 for qemu-devel@nongnu.org; Sun, 14 Oct 2012 23:16:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNbAT-0003qY-27 for qemu-devel@nongnu.org; Sun, 14 Oct 2012 23:16:39 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:46483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNbAS-0003qP-58 for qemu-devel@nongnu.org; Sun, 14 Oct 2012 23:16:36 -0400 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Oct 2012 08:46:33 +0530 Received: from d28relay05.in.ibm.com (9.184.220.62) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Oct 2012 08:46:27 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9F3GQuE4784390 for ; Mon, 15 Oct 2012 08:46:26 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9F8jrMM007705 for ; Mon, 15 Oct 2012 19:45:53 +1100 Received: from RedHat62GAWSWenchao ([9.115.122.38]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q9F8gecI032132; Mon, 15 Oct 2012 19:45:52 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2012 11:13:04 +0800 Message-Id: <1350270787-24200-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1350270787-24200-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1350270787-24200-1-git-send-email-xiawenc@linux.vnet.ibm.com> x-cbid: 12101503-5816-0000-0000-000004E4491B X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.2 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, blauwirbel@gmail.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V8 1/4] 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 non PIC and PIC ones in ./libqblock. GCC compiler flag visibility=hidden was used with special macro, to export only symbols that was marked as PUBLIC. For testing, make check-libqblock will build binaries and execute it, make clean or make check-clean will delete generated binaries. By default this library will be built and tested, out of tree building is supported. Signed-off-by: Wenchao Xia --- .gitignore | 2 + Makefile | 14 ++++++- configure | 4 ++- libqblock/Makefile | 72 +++++++++++++++++++++++++++++++++++++ libqblock/libqblock.pc.in | 13 +++++++ tests/Makefile | 36 ++++++++++++++++++- tests/libqblock/libqblock-qcow2.c | 4 ++ 7 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 libqblock/Makefile create mode 100644 libqblock/libqblock-error.c create mode 100644 libqblock/libqblock-error.h create mode 100644 libqblock/libqblock-types.h create mode 100644 libqblock/libqblock.c create mode 100644 libqblock/libqblock.h create mode 100644 libqblock/libqblock.pc.in create mode 100644 tests/libqblock/libqblock-qcow2.c diff --git a/.gitignore b/.gitignore index bd6ba1c..76207fe 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,5 @@ cscope.* tags TAGS *~ +tests/libqblock/check-* +tests/libqblock/test_images diff --git a/Makefile b/Makefile index a9c22bf..87d2ff2 100644 --- a/Makefile +++ b/Makefile @@ -169,6 +169,16 @@ 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 +libqblock.la: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libqblock V="$(V)" TARGET_DIR="$*/" libqblock.la,) + +install-libqblock: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libqblock V="$(V)" TARGET_DIR="$*/" install-libqblock,) + +########################################################################### + 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 $@") @@ -231,8 +241,8 @@ clean: rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp) rm -rf qapi-generated rm -rf qga/qapi-generated - $(MAKE) -C tests/tcg clean - for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ + $(MAKE) check-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/configure b/configure index 353d788..d88c485 100755 --- a/configure +++ b/configure @@ -3072,7 +3072,7 @@ tools="" if test "$want_tools" = "yes" ; then tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then - tools="qemu-nbd\$(EXESUF) $tools" + tools="libqblock.la qemu-nbd\$(EXESUF) $tools" fi fi if test "$softmmu" = yes ; then @@ -4112,12 +4112,14 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" +DIRS="$DIRS libqblock tests/libqblock" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" +FILES="$FILES libqblock/Makefile libqblock/libqblock.h libqblock/libqblock-error.h libqblock/libqblock-types.h" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.rom \ diff --git a/libqblock/Makefile b/libqblock/Makefile new file mode 100644 index 0000000..6113a47 --- /dev/null +++ b/libqblock/Makefile @@ -0,0 +1,72 @@ +########################################################################### +# 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) + +#library objects +libqblock-y=libqblock/libqblock.o libqblock/libqblock-error.o +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 + + +QEMU_OBJS= $(libqblock-y) $(block-obj-y) $(tools-obj-y) +QEMU_OBJS_LIB=$(patsubst %.o, %.lo, $(QEMU_OBJS)) + +QEMU_CFLAGS+= -I$(SRC_PATH) -I$(SRC_PATH)/include -I../ +#adding magic macro define for symbol hiding and exposing +QEMU_CFLAGS+= -fvisibility=hidden -D LIBQB_BUILD + +#dependency libraries +LIBS+=-lz $(LIBS_TOOLS) + +#header files to be installed +libqblock-pub-headers=libqblock.h libqblock-types.h libqblock-error.h +libqblock_includedir=$(includedir)/qblock +libqblock_srcpath=$(SRC_PATH)/libqblock + +################################################################# +# Runtime rules +################################################################# +clean: + rm -f *.lo *.o *.d *.la libqblock-test trace.c trace.c-timestamp *.pc + rm -rf .libs block trace audio fsdev hw net qapi qga qom slirp ui libqblock + +all: libqblock.la libqblock.pc +# Dummy command so that make thinks it has done something + @true + +libqblock.la: $(QEMU_OBJS_LIB) + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(LIBS)," lt LINK $@") + +libqblock.pc: $(libqblock_srcpath)/libqblock.pc.in + $(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \ + -e 's|@INCLUDEDIR@|$(libqblock_includedir)|' \ + -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ + -e 's|@PREFIX@|$(prefix)|' \ + < $(libqblock_srcpath)/libqblock.pc.in > libqblock.pc,\ + " GEN $@") + +.PHONY: install-libqblock + +install-libqblock: libqblock.la libqblock.pc + $(INSTALL_DIR) "$(DESTDIR)$(libdir)" + $(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" + $(INSTALL_DIR) "$(DESTDIR)$(libqblock_includedir)" + $(LIBTOOL) --mode=install $(INSTALL_DATA) libqblock.la "$(DESTDIR)$(libdir)" + $(LIBTOOL) --mode=install $(INSTALL_DATA) libqblock.pc "$(DESTDIR)$(libdir)/pkgconfig" + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(libqblock-pub-headers) "$(DESTDIR)$(libqblock_includedir)" diff --git a/libqblock/libqblock-error.c b/libqblock/libqblock-error.c new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock-error.h b/libqblock/libqblock-error.h new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock-types.h b/libqblock/libqblock-types.h new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock.c b/libqblock/libqblock.c new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock.h b/libqblock/libqblock.h new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock.pc.in b/libqblock/libqblock.pc.in new file mode 100644 index 0000000..d2a7d06 --- /dev/null +++ b/libqblock/libqblock.pc.in @@ -0,0 +1,13 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=@LIBDIR@ +includedir=@INCLUDEDIR@ + +Name: qblock +Description: QEMU block layer library +Version: @VERSION@ + +Requires: rt gthread-2.0 glib-2.0 z curl cap-ng uuid +Libs: -L${libdir} -lqblock +Libs.private: +Cflags: -I${includedir} diff --git a/tests/Makefile b/tests/Makefile index 26a67ce..8a1b61b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -84,6 +84,22 @@ check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET) qtest-obj-y = tests/libqtest.o $(oslib-obj-y) $(tools-obj-y) $(check-qtest-y): $(qtest-obj-y) +#libqblock test rules + +LIBQBLOCK_TEST_DIR= tests/libqblock/test_images +LIBQBLOCK_DIR = libqblock +LIBQBLOCK_SO = $(LIBQBLOCK_DIR)/.libs/libqblock.so +LIBQBLOCK_SO_LINK_FLAG= -Wl,-rpath,$(LIBQBLOCK_DIR)/.libs + +tests/libqblock/%.o: QEMU_CFLAGS:= $(subst -fPIE,-fPIC, $(QEMU_CFLAGS)) +tests/libqblock/%.o: QEMU_CFLAGS:= $(subst -DPIE,-DPIC, $(QEMU_CFLAGS)) +tests/libqblock/%.o: QEMU_INCLUDES += -I$(SRC_PATH)/tests -I$(SRC_PATH)/$(LIBQBLOCK_DIR) + +check-libqblock-y = tests/libqblock/check-libqblock-qcow2$(EXESUF) + +tests/libqblock/check-libqblock-qcow2$(EXESUF): tests/libqblock/libqblock-qcow2.o $(LIBQBLOCK_SO) + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(LIBQBLOCK_SO_LINK_FLAG)," LINK $@") + .PHONY: check-help check-help: @echo "Regression testing targets:" @@ -93,7 +109,9 @@ check-help: @echo " make check-qtest Run qtest tests" @echo " make check-unit Run qobject tests" @echo " make check-block Run block tests" + @echo " make check-libqblock Run libqblock tests" @echo " make check-report.html Generates an HTML test report" + @echo " make check-clean Clean the test" @echo @echo "Please note that HTML reports do not regenerate if the unit tests" @echo "has not changed." @@ -116,6 +134,11 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y) $(patsubst %, check-%, $(check-unit-y)): check-%: % $(call quiet-command,gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*") +#libqblock tests +.PHONY: $(patsubst %, check-%, $(check-libqblock-y)) +$(patsubst %, check-%, $(check-libqblock-y)): check-%: % + $(call quiet-command, LIBQBLOCK_TEST_DIR=$(LIBQBLOCK_TEST_DIR) gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*") + # gtester tests with XML output $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y) @@ -146,6 +169,17 @@ check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-unit check-qtest +check-libqblock: $(patsubst %,check-%, $(check-libqblock-y)) +check: check-unit check-qtest check-libqblock + +check-clean: + $(MAKE) -C tests/tcg clean + rm -f $(check-unit-y) + rm -f $(check-qtest-i386-y) $(check-qtest-x86_64-y) $(check-qtest-sparc64-y) $(check-qtest-sparc-y) + rm -f tests/*.o + rm -f tests/libqblock/*.o + rm -f $(check-libqblock-y) + rm -rf $(LIBQBLOCK_TEST_DIR) + -include $(wildcard tests/*.d) diff --git a/tests/libqblock/libqblock-qcow2.c b/tests/libqblock/libqblock-qcow2.c new file mode 100644 index 0000000..c05c0c4 --- /dev/null +++ b/tests/libqblock/libqblock-qcow2.c @@ -0,0 +1,4 @@ +int main(int argc, char **argv) +{ + return 0; +}