search for: libnbdkit_private_init

...cket.h> > + > +/* Defines the private function which is used by the server to > + * initialize libnbdkit.so at runtime. This ABI may change at any > + * time, which is why nbdkit and the corresponding libnbdkit.so must > + * always be shipped together. > + */ > +extern void libnbdkit_private_init (const char *expected_version); > + Should this read "may change at any time, other than the first parameter for expected_version, which is why..."? > +#endif /* NBDKIT_LIB_H */ > diff --git a/lib/init.c b/lib/init.c > +void > +libnbdkit_private_init (const char *expect...

...to check if conn could be NULL (eg. outside a connection context) diff --git a/server/main.c b/server/main.c index 9fcb8e13..156d85bd 100644 --- a/server/main.c +++ b/server/main.c @@ -171,6 +171,11 @@ main (int argc, char *argv[]) /* Initialize libnbdkit.so. This must be done very early. */ libnbdkit_private_init (PACKAGE_VERSION, &verbose, + do_nbdkit_export_name, + do_nbdkit_nanosleep, + do_nbdkit_peer_name, + do_nbdkit_set_error, + do_nbdkit_shutdown,...

This is the previous 5/9 patch posted earlier today, split into reviewable chunks. This passes bisection with -x 'make && make check', but I didn't work very hard on the commit messages, so I refer you back to the original patch to explain how it works: https://www.redhat.com/archives/libguestfs/2020-March/msg00248.html Rich.

...ys/types.h> +#include <sys/socket.h> + +/* Defines the private function which is used by the server to + * initialize libnbdkit.so at runtime. This ABI may change at any + * time, which is why nbdkit and the corresponding libnbdkit.so must + * always be shipped together. + */ +extern void libnbdkit_private_init (const char *expected_version); + +#endif /* NBDKIT_LIB_H */ diff --git a/lib/init.c b/lib/init.c new file mode 100644 index 00000000..ef7eeb3d --- /dev/null +++ b/lib/init.c @@ -0,0 +1,53 @@ +/* nbdkit + * Copyright (C) 2013-2020 Red Hat Inc. + * + * Redistribution and use in source and binary for...

This creates libnbdkit.so as discussed in the following thread: https://www.redhat.com/archives/libguestfs/2020-March/thread.html#00203 test-delay-shutdown.sh fails for unclear reasons. This series starts by reverting "tests: Don't strand hung nbdkit processes" which is because several other tests fail randomly unless I revert this patch. I didn't investigate this yet so it

...bdkit_parse_int; + nbdkit_parse_size; + nbdkit_parse_uint16_t; + nbdkit_parse_uint32_t; + nbdkit_parse_uint64_t; + nbdkit_parse_uint8_t; + nbdkit_parse_unsigned; + nbdkit_read_password; + nbdkit_realpath; # Private function that must only be called by the server. libnbdkit_private_init; -- 2.25.0