On 12/7/18 10:12 AM, Richard W.M. Jones wrote:
On Fri, Dec 07, 2018 at 10:00:42AM -0600, Eric Blake wrote:
Use new 'name_of_*' functions to offer a bit more details about messages being forwarded on to the remote server.
Signed-off-by: Eric Blake <eblake@redhat.com> --- plugins/nbd/nbd.c | 8 +++++--- plugins/nbd/Makefile.am | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-)
+++ b/plugins/nbd/Makefile.am @@ -38,7 +38,8 @@ plugin_LTLIBRARIES = nbdkit-nbd-plugin.la
nbdkit_nbd_plugin_la_SOURCES = \ nbd.c \ - $(top_srcdir)/include/nbdkit-plugin.h + $(top_srcdir)/include/nbdkit-plugin.h \ + $(top_srcdir)/src/protostrings.c
nbdkit_nbd_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/include \
Patch 6/5 had me confused for a while there :-)
ACK.
Now that I've pushed, I'm noticing: plugins/nbd/Makefile.am:39: warning: source file '$(top_srcdir)/src/protostrings.c' is in a subdirectory, plugins/nbd/Makefile.am:39: but option 'subdir-objects' is disabled automake-1.15: warning: possible forward-incompatibility. automake-1.15: At least a source file is in a subdirectory, but the 'subdir-objects' automake-1.15: automake option hasn't been enabled. For now, the corresponding output automake-1.15: object file(s) will be placed in the top-level directory. However, automake-1.15: this behaviour will change in future Automake versions: they will automake-1.15: unconditionally cause object files to be placed in the same subdirectory automake-1.15: of the corresponding sources. automake-1.15: You are advised to start using 'subdir-objects' option throughout your automake-1.15: project, to avoid future incompatibilities. I don't think using subdir-objects is what we want to do, so better may be to compile protostrings.c under common/protocol as a convenience library. I'll play with that idea and post patches to see how it looks. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org