[Libguestfs] [PATCH nbdkit] nbd: Update for libnbd 0.9.6.

[Richard W.M. Jones]

---
 configure.ac      |  4 ++--
 plugins/nbd/nbd.c | 12 +++++++++---
 README            |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8c7ee8b..0ce78c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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_LIBS" != "x"])
 
diff --git a/plugins/nbd/nbd.c b/plugins/nbd/nbd.c
index 2ddb2c0..e8bc779 100644
--- a/plugins/nbd/nbd.c
+++ b/plugins/nbd/nbd.c
@@ -57,6 +57,7 @@
 
 /* The per-transaction details */
 struct transaction {
+  int64_t cookie;
   sem_t sem;
   uint32_t early_err;
   uint32_t err;
@@ -353,15 +354,19 @@ nbdplug_prepare (struct transaction *trans)
 }
 
 static int
-nbdplug_notify (unsigned valid_flag, void *opaque, int64_t cookie, int *error)
+nbdplug_notify (unsigned valid_flag, void *opaque, int *error)
 {
   struct transaction *trans = opaque;
 
   if (!(valid_flag & LIBNBD_CALLBACK_VALID))
     return 0;
 
+  /* There's a possible race here where trans->cookie has not yet been
+   * updated by nbdplug_register, but it's only an informational
+   * message.
+   */
   nbdkit_debug ("cookie %" PRId64 " completed state machine, status %d",
-                cookie, *error);
+                trans->cookie, *error);
   trans->err = *error;
   if (sem_post (&trans->sem)) {
     nbdkit_error ("failed to post semaphore: %m");
@@ -383,6 +388,7 @@ nbdplug_register (struct handle *h, struct transaction *trans, int64_t cookie)
   }
 
   nbdkit_debug ("cookie %" PRId64 " started by state machine", cookie);
+  trans->cookie = cookie;
 
   if (write (h->fds[1], &c, 1) != 1 && errno != EAGAIN)
     nbdkit_debug ("failed to kick reader thread: %m");
@@ -504,7 +510,7 @@ nbdplug_open (int readonly)
 static void
 nbdplug_close_handle (struct handle *h)
 {
-  if (nbd_shutdown (h->nbd) == -1)
+  if (nbd_shutdown (h->nbd, 0) == -1)
     nbdkit_debug ("failed to clean up handle: %s", nbd_get_error ());
   if ((errno = pthread_join (h->reader, NULL)))
     nbdkit_debug ("failed to join reader thread: %m");
diff --git a/README b/README
index 26614d5..06c16dd 100644
--- a/README
+++ b/README
@@ -113,7 +113,7 @@ For the linuxdisk plugin:
 
 For the nbd plugin, to get URI and TLS support:
 
- - libnbd >= 0.1.9
+ - libnbd >= 0.9.6
 
 For the Perl, example4 and tar plugins:
 
-- 
2.22.0