From patchwork Wed Jul 27 20:38:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clord@redhat.com X-Patchwork-Id: 9250385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E6FCF6077C for ; Wed, 27 Jul 2016 20:42:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D93512522B for ; Wed, 27 Jul 2016 20:42:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD1912624C; Wed, 27 Jul 2016 20:42:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7EE722522B for ; Wed, 27 Jul 2016 20:42:08 +0000 (UTC) Received: from localhost ([::1]:48560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSVeZ-0006k5-Ek for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jul 2016 16:42:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSVbT-0004TS-59 for qemu-devel@nongnu.org; Wed, 27 Jul 2016 16:38:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSVbQ-0004ku-Qr for qemu-devel@nongnu.org; Wed, 27 Jul 2016 16:38:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSVbO-0004kG-6H; Wed, 27 Jul 2016 16:38:50 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC1387DD06; Wed, 27 Jul 2016 20:38:49 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (ovpn-116-98.phx2.redhat.com [10.3.116.98]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6RKcjSq025102; Wed, 27 Jul 2016 16:38:48 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Wed, 27 Jul 2016 16:38:43 -0400 Message-Id: <1469651923-20723-3-git-send-email-clord@redhat.com> In-Reply-To: <1469651923-20723-1-git-send-email-clord@redhat.com> References: <1469651923-20723-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 27 Jul 2016 20:38:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] blockdev: Modularize nfs block driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Colin Lord , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Modularizes the nfs block driver so that it gets dynamically loaded. Signed-off-by: Colin Lord --- block/Makefile.objs | 1 + configure | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index 595f366..fa4d8b8 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -28,6 +28,7 @@ block-obj-y += crypto.o common-obj-y += stream.o common-obj-y += backup.o +nfs.o-libs := $(LIBNFS_LIBS) iscsi.o-cflags := $(LIBISCSI_CFLAGS) iscsi.o-libs := $(LIBISCSI_LIBS) curl.o-cflags := $(CURL_CFLAGS) diff --git a/configure b/configure index 879324b..6086d2e 100755 --- a/configure +++ b/configure @@ -4558,7 +4558,6 @@ if test "$libnfs" != "no" ; then if $pkg_config --atleast-version=1.9.3 libnfs; then libnfs="yes" libnfs_libs=$($pkg_config --libs libnfs) - LIBS="$LIBS $libnfs_libs" else if test "$libnfs" = "yes" ; then feature_not_found "libnfs" "Install libnfs devel >= 1.9.3" @@ -5317,7 +5316,8 @@ if test "$libiscsi" = "yes" ; then fi if test "$libnfs" = "yes" ; then - echo "CONFIG_LIBNFS=y" >> $config_host_mak + echo "CONFIG_LIBNFS=m" >> $config_host_mak + echo "LIBNFS_LIBS=$libnfs_libs" >> $config_host_mak fi if test "$seccomp" = "yes"; then