From patchwork Tue Sep 10 01:02:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 273739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 97C942C00E3 for ; Tue, 10 Sep 2013 11:04:16 +1000 (EST) Received: from localhost ([::1]:54275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJCNK-00081F-Cz for incoming@patchwork.ozlabs.org; Mon, 09 Sep 2013 21:04:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJCMc-0007OX-Dw for qemu-devel@nongnu.org; Mon, 09 Sep 2013 21:03:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJCMX-0006CL-3U for qemu-devel@nongnu.org; Mon, 09 Sep 2013 21:03:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJCMW-0006CE-RA for qemu-devel@nongnu.org; Mon, 09 Sep 2013 21:03:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8A13LV3032254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Sep 2013 21:03:21 -0400 Received: from T430s.nay.redhat.com ([10.66.5.155]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r8A12xP6015290; Mon, 9 Sep 2013 21:03:18 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 10 Sep 2013 09:02:58 +0800 Message-Id: <1378774978-22602-6-git-send-email-famz@redhat.com> In-Reply-To: <1378774978-22602-1-git-send-email-famz@redhat.com> References: <1378774978-22602-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, famz@redhat.com, mjt@tls.msk.ru, stefanha@redhat.com, pbonzini@redhat.com, vilanova@ac.upc.edu, rth@twiddle.net Subject: [Qemu-devel] [RFC PATCH v3 5/5] block: build qed and curl as shared library 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 Curl and qed block drivers are built as shared object module. We have per object cflags and libs support now, move CURL_CFLAGS and CURL_LIBS from global option variables to a per object basis. "make install" is not installing them yet, manually copy it to ${prefix}/qemu/block/ to make it loaded. Signed-off-by: Fam Zheng --- block/Makefile.objs | 7 ++++--- configure | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index 3bb85b5..741b92f 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,7 +1,6 @@ block-obj-y += raw_bsd.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o -block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o -block-obj-y += qed-check.o +block-obj-m += qed.mo block-obj-y += vhdx.o block-obj-y += parallels.o blkdebug.o blkverify.o block-obj-y += snapshot.o qapi.o @@ -23,4 +22,6 @@ common-obj-y += commit.o common-obj-y += mirror.o common-obj-y += backup.o -$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS) +curl.o-cflags := $(CURL_CFLAGS) +curl.o-libs := $(CURL_LIBS) +qed.mo-objs := qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o qed-check.o diff --git a/configure b/configure index a2858c2..136ac1a 100755 --- a/configure +++ b/configure @@ -2213,8 +2213,6 @@ EOF curl_libs=`$curlconfig --libs 2>/dev/null` if compile_prog "$curl_cflags" "$curl_libs" ; then curl=yes - libs_tools="$curl_libs $libs_tools" - libs_softmmu="$curl_libs $libs_softmmu" else if test "$curl" = "yes" ; then feature_not_found "curl" @@ -3893,8 +3891,9 @@ if test "$bswap_h" = "yes" ; then echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak fi if test "$curl" = "yes" ; then - echo "CONFIG_CURL=y" >> $config_host_mak + echo "CONFIG_CURL=m" >> $config_host_mak echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak + echo "CURL_LIBS=$curl_libs" >> $config_host_mak fi if test "$brlapi" = "yes" ; then echo "CONFIG_BRLAPI=y" >> $config_host_mak