[Qemu-devel] [PATCH 0/2] Modularize NFS Block Driver and Makefile Cleanup

[Qemu-devel] [PATCH 0/2] Modularize NFS Block Driver and Makefile Cleanup

[Colin Lord]

Some very short patches as a followup to my last patches to add dynamic
loading of block driver modules. The first patch removes some leftover
lines from the Makefile which should have been deleted, and the other
patch modularizes the NFS block driver. The NFS block driver is the only
remaining protocol block driver that links to external libraries that
has not been modularized (once my last patch set is applied).

Colin Lord (2):
  blockdev: Remove unnecessary lines from Makefile
  blockdev: Modularize nfs block driver

 Makefile            | 3 ---
 block/Makefile.objs | 1 +
 configure           | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

-- 
2.5.5

[Qemu-devel] [PATCH 1/2] blockdev: Remove unnecessary lines from Makefile

[Colin Lord]

Removes some superfluous lines from the Makefile which should have been
removed as part of the patch series to add dynamic loading for block
driver modules.

Signed-off-by: Colin Lord <clord@redhat.com>
---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4b9384e..c7aa8cd 100644
--- a/Makefile
+++ b/Makefile
@@ -247,9 +247,6 @@ Makefile: $(version-obj-y) $(version-lobj-y)
 libqemustub.a: $(stub-obj-y)
 libqemuutil.a: $(util-obj-y)
 
-block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL
-util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)'
-
 ######################################################################
 
 qemu-img.o: qemu-img-cmds.h
-- 
2.5.5

[Qemu-devel] [PATCH 2/2] blockdev: Modularize nfs block driver

[Colin Lord]

Modularizes the nfs block driver so that it gets dynamically loaded.

Signed-off-by: Colin Lord <clord@redhat.com>
---
 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
-- 
2.5.5

Re: [Qemu-devel] [PATCH 1/2] blockdev: Remove unnecessary lines from Makefile

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

On 07/27/2016 02:38 PM, Colin Lord wrote:
> Removes some superfluous lines from the Makefile which should have been
> removed as part of the patch series to add dynamic loading for block
> driver modules.

If that series has not been merged to master yet, it may be better to
just squash this into that patch; maybe the maintainer can do that, but
it may also be easiest to just send another version of that series.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]