search for: libnbd_libs

libnbd 0.1.7 was released today, which breaks compilation of nbdkit-nbd-plugin. We could work around it by using #ifdef LIBNBD_HAVE_XXX to learn about the renamed functions, but supporting older versions is not all that important when we don't yet have API stability. So patch 1 copes by just bumping the minimum version instead, except that we have yet another pending libnbd patch with an API

...718,12 +718,12 @@ AC_ARG_WITH([libnbd], [], [with_libnbd=check]) AS_IF([test "$with_libnbd" != "no"],[ - PKG_CHECK_MODULES([LIBNBD], [libnbd >= 0.1.7],[ + PKG_CHECK_MODULES([LIBNBD], [libnbd >= 0.1.8],[ AC_SUBST([LIBNBD_CFLAGS]) AC_SUBST([LIBNBD_LIBS]) AC_DEFINE([HAVE_LIBNBD],[1],[libnbd found at compile time.]) ], - [AC_MSG_WARN([libnbd >= 0.1.7 not found, nbd plugin will be crippled])]) + [AC_MSG_WARN([libnbd >= 0.1.8 not found, nbd plugin will be crippled])]) ]) AM_CONDITIONAL([HAVE_LIBNBD], [test "x$LIBNBD_L...

...718,12 +718,12 @@ AC_ARG_WITH([libnbd], [], [with_libnbd=check]) AS_IF([test "$with_libnbd" != "no"],[ - PKG_CHECK_MODULES([LIBNBD], [libnbd >= 0.1.9],[ + PKG_CHECK_MODULES([LIBNBD], [libnbd >= 0.9.6],[ AC_SUBST([LIBNBD_CFLAGS]) AC_SUBST([LIBNBD_LIBS]) AC_DEFINE([HAVE_LIBNBD],[1],[libnbd found at compile time.]) ], - [AC_MSG_WARN([libnbd >= 0.1.9 not found, nbd plugin will be crippled])]) + [AC_MSG_WARN([libnbd >= 0.9.6 not found, nbd plugin will be crippled])]) ]) AM_CONDITIONAL([HAVE_LIBNBD], [test "x$LIBNBD_L...

...721,12 +721,12 @@ AC_ARG_WITH([libnbd], [], [with_libnbd=check]) AS_IF([test "$with_libnbd" != "no"],[ - PKG_CHECK_MODULES([LIBNBD], [libnbd >= 0.9.6],[ + PKG_CHECK_MODULES([LIBNBD], [libnbd >= 0.9.8],[ AC_SUBST([LIBNBD_CFLAGS]) AC_SUBST([LIBNBD_LIBS]) AC_DEFINE([HAVE_LIBNBD],[1],[libnbd found at compile time.]) ], - [AC_MSG_WARN([libnbd >= 0.9.6 not found, nbd plugin will be crippled])]) + [AC_MSG_WARN([libnbd >= 0.9.8 not found, nbd plugin will be crippled])]) ]) AM_CONDITIONAL([HAVE_LIBNBD], [test "x$LIBNBD_L...

...[with_libnbd=check]) AS_IF([test "$with_libnbd" != "no"],[ @@ -852,14 +852,14 @@ AS_IF([test "$with_libnbd" != "no"],[ ], [AC_MSG_WARN([libnbd >= 0.9.8 not found, nbd plugin will be crippled])]) ]) -AM_CONDITIONAL([HAVE_LIBNBD], [test "x$LIBNBD_LIBS" != "x"]) -dnl Also you can disable the whole nbd plugin. +dnl For backwards compatibilty, we have a second way to disable the nbd plugin. AC_ARG_ENABLE([nbd-plugin], [AS_HELP_STRING([--disable-nbd-plugin], [disable nbd plugin])], [], [enable_nbd_plugin=yes]) -AM_CON...

...RA_DIST = \ test-sh-extents.sh \ test-single.sh \ test-single-from-file.sh \ + test-split-extents.sh \ test-start.sh \ test-random-sock.sh \ test-tls.sh \ @@ -672,6 +673,8 @@ test_split_SOURCES = test-split.c test_split_CFLAGS = $(WARNINGS_CFLAGS) $(LIBNBD_CFLAGS) test_split_LDADD = $(LIBNBD_LIBS) +TESTS += test-split-extents.sh + # ssh plugin test. if HAVE_SSH # Uses ‘disk’ so we have to make it conditional on guestfish. diff --git a/tests/test-split-extents.sh b/tests/test-split-extents.sh new file mode 100755 index 0000000..da385a4 --- /dev/null +++ b/tests/test-split-extents.sh @@ -...

Patch 1 played with an early draft of Rich's Fedora 30 libnbd package: https://bugzilla.redhat.com/show_bug.cgi?id=1713767#c17 Note that comment 21 provides a newer package 0.1.1-1 with a different API; and that libnbd has more unreleased API changes in the pipeline (whether that will be called 0.2 or 0.1.2); so we'll have to tweak things based on what is actually available in distros.

libnbd-0.1.2-1 is now available in Fedora 29/30 updates-testing, although it was not compiled against libxml2 so it lacks uri support (I ended up testing patch 4 with a self-built libnbd). Diffs since v1 - rebase to master, bump from libnbd 0.1 to 0.1.2, add URI support, better timing results Still not done - patch 5 needs associated tests Eric Blake (5): nbd: Check for libnbd nbd:

...top_srcdir)/common/utils \ + $(NULL) +test_curl_header_script_CFLAGS = \ + $(WARNINGS_CFLAGS) \ + $(LIBNBD_CFLAGS) \ + $(PTHREAD_CFLAGS) \ + $(NULL) +test_curl_header_script_LDFLAGS = \ + $(top_builddir)/common/utils/libutils.la \ + $(PTHREAD_LIBS) \ + $(NULL) +test_curl_header_script_LDADD = \ + $(LIBNBD_LIBS) \ + $(NULL) + +test_curl_cookie_script_SOURCES = \ + test-curl-header-script.c \ + web-server.c \ + web-server.h \ + $(NULL) +test_curl_cookie_script_CPPFLAGS = \ + -I$(top_srcdir)/common/utils \ + $(NULL) +test_curl_cookie_script_CFLAGS = \ + $(WARNINGS_CFLAGS) \ + $(LIBNBD_CFLAGS) \ + $(PTHREAD_...

libnbd-0.1.4-1 is now available in Fedora 29/30 updates testing. Diffs since v2 - rebase to master, bump from libnbd 0.1.2 to 0.1.3+, add tests to TLS usage which flushed out the need to turn relative pathnames into absolute, doc tweaks Now that the testsuite covers TLS and libnbd has been fixed to provide the things I found lacking when developing v2, I'm leaning towards pushing this on

Evolution of this patch series: https://www.redhat.com/archives/libguestfs/2020-July/thread.html#00073 Instead of auth-script, this implements header-script and cookie-script. It can be used for similar purposes but the implementation is somewhat saner. Rich.

...HAVE_POD - -endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 16043f49..9ab6a7af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -828,11 +828,15 @@ test_streaming_SOURCES = test-streaming.c test_streaming_CFLAGS = $(WARNINGS_CFLAGS) $(LIBNBD_CFLAGS) test_streaming_LDADD = $(LIBNBD_LIBS) -# tar plugin test (written in perl). -if HAVE_PERL -TESTS += test-tar.sh -endif HAVE_PERL -EXTRA_DIST += test-tar.sh +# tar plugin test. +TESTS += \ + test-tar.sh \ + test-tar-info.sh \ + $(NULL) +EXTRA_DIST += \ + test-tar.sh \ + test-tar-info.sh \ + $(NULL) # tmpdisk plugin test. LIBGUEST...

...+ +endif HAVE_POD diff --git a/tests/Makefile.am b/tests/Makefile.am index 062ade84..2bc10d70 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -830,16 +830,6 @@ test_streaming_SOURCES = test-streaming.c test_streaming_CFLAGS = $(WARNINGS_CFLAGS) $(LIBNBD_CFLAGS) test_streaming_LDADD = $(LIBNBD_LIBS) -# tar plugin test. -TESTS += \ - test-tar.sh \ - test-tar-info.sh \ - $(NULL) -EXTRA_DIST += \ - test-tar.sh \ - test-tar-info.sh \ - $(NULL) - # tmpdisk plugin test. LIBGUESTFS_TESTS += test-tmpdisk TESTS += test-tmpdisk-command.sh @@ -1379,6 +1369,16 @@ EXTRA_DIST += \ test-swab-64w.sh \...

...616,10 @@ test_data_LDADD = libtest.la $(LIBGUESTFS_LIBS) TESTS += \ test-eval.sh \ test-eval-file.sh \ - test-eval-exports.sh \ $(NULL) EXTRA_DIST += \ test-eval.sh \ test-eval-file.sh \ - test-eval-exports.sh \ $(NULL) # file plugin test. @@ -756,12 +754,10 @@ test_null_LDADD = $(LIBNBD_LIBS) # ondemand plugin test. TESTS += \ test-ondemand.sh \ - test-ondemand-list.sh \ test-ondemand-locking.sh \ $(NULL) EXTRA_DIST += \ test-ondemand.sh \ - test-ondemand-list.sh \ test-ondemand-locking.sh \ $(NULL) diff --git a/server/plugins.c b/server/plugins.c index 4e320868..033df...

For context see these threads: https://lists.gnu.org/archive/html/qemu-discuss/2020-06/threads.html#00053 https://lists.gnu.org/archive/html/qemu-block/2020-06/threads.html#01496 Rich.

v2 was here: https://www.redhat.com/archives/libguestfs/2020-March/msg00154.html v3: - Micro-optimize tmpdir. - Quote $disk in default command shell fragment. - Don't redirect mkfs output to /dev/null. Instead use exec </dev/null >/dev/null before the shell fragment. We may want to do this in other places where we run external shell scripts, or more generally for all

...le.am b/plugins/nbd/Makefile.am index 671ae678..1d44b6df 100644 --- a/plugins/nbd/Makefile.am +++ b/plugins/nbd/Makefile.am @@ -58,6 +58,7 @@ nbdkit_nbd_plugin_la_LDFLAGS = \ $(NULL) nbdkit_nbd_plugin_la_LIBADD = \ $(top_builddir)/common/utils/libutils.la \ + $(LINK_LIBNBDKIT_ON_WINDOWS) \ $(LIBNBD_LIBS) \ $(NULL) diff --git a/plugins/null/Makefile.am b/plugins/null/Makefile.am index b07a70a4..1c730f48 100644 --- a/plugins/null/Makefile.am +++ b/plugins/null/Makefile.am @@ -44,6 +44,9 @@ nbdkit_null_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/include \ $(NULL) nbdkit_null_plugin_la_CFLAGS = $(...

For review only, this needs some clean up and more tests. My eyes are going cross-eyed looking at the calculate_offset_of_entry function, so time to take a break ... Rich.

If you're following nbdkit development upstream you'll have seen that we are still making changes to the .list_exports and related APIs. The current .list_exports API upstream is not how it will look finally. The latest set of proposals was here: https://www.redhat.com/archives/libguestfs/2020-August/thread.html#00330 At the same time I'd like to do an nbdkit 1.22 (stable) release.

...+ +endif HAVE_POD diff --git a/tests/Makefile.am b/tests/Makefile.am index 65dd148d..17f2c8da 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -766,6 +766,27 @@ test_streaming_SOURCES = test-streaming.c test_streaming_CFLAGS = $(WARNINGS_CFLAGS) $(LIBNBD_CFLAGS) test_streaming_LDADD = $(LIBNBD_LIBS) +# tmpdisk plugin test. +LIBGUESTFS_TESTS += test-tmpdisk + +test_tmpdisk_SOURCES = \ + test-tmpdisk.c \ + test.h \ + $(NULL) +test_tmpdisk_CPPFLAGS = \ + -I$(top_srcdir)/common/utils +test_tmpdisk_CFLAGS = \ + $(WARNINGS_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ + $(NULL) +test_tmpdisk_LDFLAGS = \ + $...