search for: free_debug_flag

The immediate reason for this patch is to reduce the amount of debugging in virt-v2v with using the virt-v2v -v option (because this implies running nbdkit in verbose mode too). Most of the messages are datapath ones about pread/pwrite requests, and in fact as we've added more filters on top of nbdkit these messages have got more and more verbose. However they are not particularly

...index 486ff35..ebac3ef 100644 --- a/server/main.c +++ b/server/main.c @@ -613,6 +613,9 @@ main (int argc, char *argv[]) free (t); } + /* Apply nbdkit.* flags for the server. */ + apply_debug_flags (NULL, "nbdkit"); + /* Check all debug flags were used, and free them. */ free_debug_flags (); diff --git a/server/nbdkit.syms b/server/nbdkit.syms index 390972e..96c22c0 100644 --- a/server/nbdkit.syms +++ b/server/nbdkit.syms @@ -67,6 +67,8 @@ nbdkit_vdebug; nbdkit_verror; + nbdkit_debug_*; + # Everything else is hidden. local: *; }; -- 2.23.0

...sertions(+), 5 deletions(-) diff --git a/server/internal.h b/server/internal.h index e5c7f514..b43798ff 100644 --- a/server/internal.h +++ b/server/internal.h @@ -297,6 +297,9 @@ extern void add_debug_flag (const char *arg); extern void apply_debug_flags (void *dl, const char *name); extern void free_debug_flags (void); +/* log.c */ +extern void log_verror (const char *fs, va_list args); + /* log-*.c */ extern void log_stderr_verror (const char *fs, va_list args) __attribute__((__format__ (printf, 1, 0))); diff --git a/server/log.c b/server/log.c index 73493563..37de3dd2 100644 --- a/server/log.c +...

...dump_environment (void) +{ + size_t i; + + for (i = 0; environ[i]; ++i) + nbdkit_debug ("%s", environ[i]); +} + +#endif /* !WIN32 */ + int main (int argc, char *argv[]) { @@ -662,6 +682,14 @@ main (int argc, char *argv[]) /* Check all debug flags were used, and free them. */ free_debug_flags (); +#ifndef WIN32 + /* Dump the environment if asked. This is the earliest we can do it + * because it uses a debug flag. + */ + if (nbdkit_debug_environ && verbose) + dump_environment (); +#endif + if (help) { struct backend *b; -- 2.39.2

...ude/nbdkit-plugin.h \ $(top_srcdir)/include/nbdkit-filter.h \ $(NULL) diff --git a/server/internal.h b/server/internal.h index e39db8a8..e5c7f514 100644 --- a/server/internal.h +++ b/server/internal.h @@ -298,16 +298,18 @@ extern void apply_debug_flags (void *dl, const char *name); extern void free_debug_flags (void); /* log-*.c */ +extern void log_stderr_verror (const char *fs, va_list args) + __attribute__((__format__ (printf, 1, 0))); +extern void log_syslog_verror (const char *fs, va_list args) + __attribute__((__format__ (printf, 1, 0))); + +/* vfprintf.c */ #if !HAVE_VFPRINTF_PERCENT_M #inc...

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

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.