search for: ea3155c

...\ + (plugin)._zero_old = nbdkit_zero_old; \ + return &(plugin); \ + } + +#endif + #ifdef __cplusplus } #endif diff --git a/src/internal.h b/src/internal.h index ea3155c..e803875 100644 --- a/src/internal.h +++ b/src/internal.h @@ -40,7 +40,7 @@ #include <sys/socket.h> #include <pthread.h> -#define NBDKIT_API_VERSION 2 +#define NBDKIT_PLUGIN_LEVEL 2 #include "nbdkit-plugin.h" #include "nbdkit-filter.h" diff --git a/src/plugins....

...); + if (err < 0) { + nbdkit_error ("failed to set TLS session priority to %s: %s", + priority, gnutls_strerror (err)); + goto error; } /* Set up GnuTLS so it reads and writes on the raw sockets, and set diff --git a/src/internal.h b/src/internal.h index ea3155c..ec19841 100644 --- a/src/internal.h +++ b/src/internal.h @@ -108,6 +108,7 @@ extern int readonly; extern const char *selinux_label; extern int tls; extern const char *tls_certificates_dir; +extern const char *tls_psk; extern int tls_verify_peer; extern char *unixsocket; extern int verbose; d...

This is ready for review but needs a bit more real-world testing before I'd be happy about it going upstream. It also needs tests. It does interoperate with qemu, at least in my limited tests. Rich.

v2: * Improved documentation. * Added a test (interop with qemu client).

...nt (*trim) (void *handle, uint32_t count, uint64_t offset, uint32_t flags); + int (*zero) (void *handle, uint32_t count, uint64_t offset, uint32_t flags); +#endif /* int (*set_exportname) (void *handle, const char *exportname); */ }; diff --git a/src/internal.h b/src/internal.h index d873cd5..ea3155c 100644 --- a/src/internal.h +++ b/src/internal.h @@ -40,6 +40,7 @@ #include <sys/socket.h> #include <pthread.h> +#define NBDKIT_API_VERSION 2 #include "nbdkit-plugin.h" #include "nbdkit-filter.h" diff --git a/src/plugins.c b/src/plugins.c index 10c911d..d44e724...

After more than a month since v2 [1], I've finally got my FUA support series polished. This is all of my outstanding patches, even though some of them were originally posted in separate threads from the original FUA post [2], [3] [1] https://www.redhat.com/archives/libguestfs/2018-January/msg00113.html [2] https://www.redhat.com/archives/libguestfs/2018-January/msg00219.html [3]