search for: have_nbdkit

...9c0 100644 --- a/ocaml/tests/Makefile.am +++ b/ocaml/tests/Makefile.am @@ -100,7 +100,10 @@ endif TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 OCAMLRUNPARAM=b LOG_COMPILER = $(top_builddir)/run -TESTS = $(tests_bc) $(tests_opt) +TESTS = $(tests_bc) +if HAVE_OCAMLOPT +TESTS += $(tests_opt) +endif endif HAVE_NBDKIT endif HAVE_OCAML -- 2.21.0

...efile.am b/sh/Makefile.am index 2eab987..50cd395 100644 --- a/sh/Makefile.am +++ b/sh/Makefile.am @@ -21,6 +21,7 @@ EXTRA_DIST = \ nbdsh.pod \ examples/LICENSE-FOR-EXAMPLES \ examples/hexdump.sh \ + test-dump.sh \ test-help.sh \ test-version.sh \ $(NULL) @@ -51,7 +52,9 @@ TESTS = \ if HAVE_NBDKIT -TESTS += +TESTS += \ + test-dump.sh \ + $(NULL) endif HAVE_NBDKIT diff --git a/sh/test-dump.sh b/sh/test-dump.sh new file mode 100755 index 0000000..2d4e261 --- /dev/null +++ b/sh/test-dump.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash +# nbd client library in userspace +# Copyright (C) 2019 Red Ha...

...46..2e9a047 100644 --- a/sh/Makefile.am +++ b/sh/Makefile.am @@ -21,6 +21,7 @@ EXTRA_DIST = \ nbdsh.pod \ examples/LICENSE-FOR-EXAMPLES \ examples/hexdump.sh \ + test-help.sh \ $(NULL) if HAVE_PYTHON @@ -40,8 +41,10 @@ nbdsh.1: nbdsh.pod $(top_builddir)/podwrapper.pl endif HAVE_POD -if HAVE_NBDKIT - TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 LOG_COMPILER = $(top_builddir)/run -TESTS = +TESTS = test-help.sh + +if HAVE_NBDKIT + +TESTS += endif HAVE_NBDKIT diff --git a/sh/test-help.sh b/sh/test-help.sh new file mode 100755 index 0000000..6ed1c9c --- /dev/null +++ b/sh/test-help.sh @@ -0,0 +1,32 @@...

I was a little surprised to find that LIBNBD_TLS_ALLOW worked out of the box, so I had to examine the logs whereupon I saw the magic message ... libnbd: debug: nbd1: nbd_connect_command: server refused TLS (policy), continuing with unencrypted connection I don't believe this path has ever been tested before. It's possible the tests could be improved if they actually checked for this

...AMS += \ interop-qemu-nbd-tls-certs \ interop-qemu-nbd-tls-psk TESTS += \ - interop-qemu-nbd \ - interop-qemu-nbd-tls-certs \ + interop-qemu-nbd + +# tls tests assume the pre-existence of files created in ../tests/Makefile.am, +# so we can only run them under the same conditions used there +if HAVE_NBDKIT +if HAVE_GNUTLS +if HAVE_CERTTOOL +TESTS += \ + interop-qemu-nbd-tls-certs +endif +if HAVE_PSKTOOL +TESTS += \ interop-qemu-nbd-tls-psk +endif +endif +endif interop_qemu_nbd_SOURCES = interop.c interop_qemu_nbd_CPPFLAGS = \ -- 2.20.1

This commit adds a simple test of qemu-storage-daemon (QSD). On the basis that QSD is just qemu-nbd in new clothes this is only a simple test, not complete coverage. Nor does it test the unique features of QSD like being able to use QMP to create new server instances. Unfortunately QSD is not yet stable upstream. This version works with qemu 5.1.0 but at least two of the command line

...uctured-read \ + $(NULL) TESTS += \ interop-qemu-nbd \ dirty-bitmap.sh \ - structured-read.sh + structured-read.sh \ + $(NULL) # tls tests assume the pre-existence of files created in ../tests/Makefile.am, # so we can only run them under the same conditions used there @@ -62,11 +65,13 @@ if HAVE_NBDKIT if HAVE_GNUTLS if HAVE_CERTTOOL TESTS += \ - interop-qemu-nbd-tls-certs + interop-qemu-nbd-tls-certs \ + $(NULL) endif if HAVE_PSKTOOL TESTS += \ - interop-qemu-nbd-tls-psk + interop-qemu-nbd-tls-psk \ + $(NULL) endif endif endif @@ -77,7 +82,8 @@ interop_qemu_nbd_CPPFLAGS = \ -DSERVE_OV...

...+ $(NULL) +socket_activation_qemu_nbd_CFLAGS = $(WARNINGS_CFLAGS) +socket_activation_qemu_nbd_LDADD = $(top_builddir)/lib/libnbd.la + structured_read_SOURCES = structured-read.c structured_read_CPPFLAGS = -I$(top_srcdir)/include structured_read_CFLAGS = $(WARNINGS_CFLAGS) @@ -135,9 +146,11 @@ if HAVE_NBDKIT check_PROGRAMS += \ interop-nbdkit \ + socket-activation-nbdkit \ $(NULL) TESTS += \ interop-nbdkit \ + socket-activation-nbdkit \ $(NULL) # See above comment about files in ../tests/Makefile.am @@ -245,6 +258,15 @@ interop_nbdkit_tls_psk_allow_fallback_CPPFLAGS = \ interop_nbdkit_t...

...@@ nbdsh.1: nbdsh.pod $(top_builddir)/podwrapper.pl endif HAVE_POD -TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 EXP_VERSION=$(VERSION) +TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 NBDKIT_DEBUG=1 EXP_VERSION=$(VERSION) LOG_COMPILER = $(top_builddir)/run TESTS = \ test-help.sh \ @@ -53,6 +54,7 @@ TESTS = \ if HAVE_NBDKIT TESTS += \ + test-context.sh \ test-pattern.sh \ $(NULL) diff --git a/sh/test-context.sh b/sh/test-context.sh new file mode 100755 index 0000000..55f9b53 --- /dev/null +++ b/sh/test-context.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env bash +# nbd client library in userspace +# Copyright (C) 2019 Red...

...quot;, "--exit-with-parent", "file", tmpfile' \ + -DPSK=1 \ + -DTLS_MODE=LIBNBD_TLS_ALLOW \ + -DTLS_FALLBACK=1 \ + $(NULL) +interop_nbdkit_tls_psk_allow_fallback_CFLAGS = $(WARNINGS_CFLAGS) +interop_nbdkit_tls_psk_allow_fallback_LDADD = $(top_builddir)/lib/libnbd.la + endif HAVE_NBDKIT check-valgrind: diff --git a/interop/interop.c b/interop/interop.c index 2772721..3d916f2 100644 --- a/interop/interop.c +++ b/interop/interop.c @@ -147,12 +147,30 @@ main (int argc, char *argv[]) #endif #if TLS - if (TLS_MODE == LIBNBD_TLS_REQUIRE && - nbd_get_tls_negotiated (...

...+ $(NULL) +socket_activation_qemu_nbd_CFLAGS = $(WARNINGS_CFLAGS) +socket_activation_qemu_nbd_LDADD = $(top_builddir)/lib/libnbd.la + structured_read_SOURCES = structured-read.c structured_read_CPPFLAGS = -I$(top_srcdir)/include structured_read_CFLAGS = $(WARNINGS_CFLAGS) @@ -135,9 +146,11 @@ if HAVE_NBDKIT check_PROGRAMS += \ interop-nbdkit \ + socket-activation-nbdkit \ $(NULL) TESTS += \ interop-nbdkit \ + socket-activation-nbdkit \ $(NULL) # See above comment about files in ../tests/Makefile.am @@ -245,6 +258,15 @@ interop_nbdkit_tls_psk_allow_fallback_CPPFLAGS = \ interop_nbdkit_t...

...TRA_DIST = \ examples/LICENSE-FOR-EXAMPLES \ examples/hexdump.sh \ test-context.sh \ + test-error.sh \ test-help.sh \ test-pattern.sh \ test-version.sh \ @@ -49,6 +50,7 @@ LOG_COMPILER = $(top_builddir)/run TESTS = \ test-help.sh \ test-version.sh \ + test-error.sh \ $(NULL) if HAVE_NBDKIT diff --git a/sh/test-error.sh b/sh/test-error.sh new file mode 100755 index 0000000..d8a1d84 --- /dev/null +++ b/sh/test-error.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# nbd client library in userspace +# Copyright (C) 2019-2020 Red Hat Inc. +# +# This library is free software; you can redistribut...

If the user calls nbd_kill_subprocess, we shouldn't kill the process again when we close the handle (since the process has likely gone and we might be killing a different process). --- lib/handle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/handle.c b/lib/handle.c index 2af25fe..5ad818e 100644 --- a/lib/handle.c +++ b/lib/handle.c @@ -315,6 +315,8 @@

...ct_request && (nbd_internal_is_state_ready (get_next_state (h)) || nbd_internal_is_state_processing (get_next_state (h)))) { diff --git a/tests/Makefile.am b/tests/Makefile.am index be7c83c..007c69e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -142,6 +142,7 @@ if HAVE_NBDKIT check_PROGRAMS += \ errors \ server-death \ + shutdown-flags \ get-size \ read-only-flag \ read-write-flag \ @@ -180,6 +181,7 @@ check_PROGRAMS += \ TESTS += \ errors \ server-death \ + shutdown-flags \ get-size \ read-only-flag \ read-write-flag \ @@ -225,6 +227,11 @@ server_...

...nbd_internal_is_state_ready (get_next_state (h)) || > nbd_internal_is_state_processing (get_next_state (h)))) { > diff --git a/tests/Makefile.am b/tests/Makefile.am > index be7c83c..007c69e 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -142,6 +142,7 @@ if HAVE_NBDKIT > check_PROGRAMS += \ > errors \ > server-death \ > + shutdown-flags \ > get-size \ > read-only-flag \ > read-write-flag \ > @@ -180,6 +181,7 @@ check_PROGRAMS += \ > TESTS += \ > errors \ > server-death \ > + shutdown-flags \ > get-size \ &g...

v1 was posted here: https://www.redhat.com/archives/libguestfs/2019-September/thread.html#00337 v2: - Drop the first patch. - Hopefully fix the multiple issues with fork-safety and general behaviour on error paths. Note this requires execvpe for which there seems to be no equivalent on FreeBSD, except some kind of tedious path parsing (but can we assign to environ?) Rich.

...ude structured_read_CFLAGS = $(WARNINGS_CFLAGS) structured_read_LDADD = $(top_builddir)/lib/libnbd.la +init_zero_SOURCES = init-zero.c +init_zero_CPPFLAGS = -I$(top_srcdir)/include +init_zero_CFLAGS = $(WARNINGS_CFLAGS) +init_zero_LDADD = $(top_builddir)/lib/libnbd.la + endif HAVE_QEMU_NBD if HAVE_NBDKIT diff --git a/interop/init-zero.c b/interop/init-zero.c new file mode 100644 index 0000000..0cf1d87 --- /dev/null +++ b/interop/init-zero.c @@ -0,0 +1,78 @@ +/* NBD client library in userspace + * Copyright (C) 2013-2020 Red Hat Inc. + * + * This library is free software; you can redistribute it and...

I will be following up to this email with four separate threads each addressed to the appropriate single list, with proposed changes to: - the NBD protocol - qemu: both server and client - libnbd: client - nbdkit: server The feature in question adds a new optional NBD_INFO_ packet to the NBD_OPT_GO portion of handshake, adding up to 16 bits of information that the server can advertise to the