search for: libprotocol

This commit, which is just code motion, moves the common XDR protocol code (libprotocol) and the common errno handling (liberrnostring) into libraries which are each built once and shared between the library and daemon. --- .gitignore | 20 +++++-------- Makefile.am | 1 + common/errnostring/Makefile.am | 45 +++++++++++++++++++++++++++++ commo...

...aemon/Makefile.am b/daemon/Makefile.am index ab3019cc1..25948dbe9 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -217,9 +217,6 @@ guestfsd_LDFLAGS = \ -L../bundled/ocaml-augeas \ -L../common/mlpcre guestfsd_LDADD = \ - ../common/errnostring/liberrnostring.la \ - ../common/protocol/libprotocol.la \ - ../common/utils/libutils.la \ camldaemon.o \ $(ACL_LIBS) \ $(CAP_LIBS) \ @@ -236,7 +233,10 @@ guestfsd_LDADD = \ $(TSK_LIBS) \ $(RPC_LIBS) \ $(YARA_LIBS) \ - $(OCAML_LIBS) + $(OCAML_LIBS) \ + ../common/errnostring/liberrnostring.la \ + ../common/protocol/libprotocol.la \ + ../com...

...diff --git a/src/Makefile.am b/src/Makefile.am index c6006d2..9eb71b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,14 @@ BUILT_SOURCES = \ guestfs-actions.c \ guestfs-bindtests.c +# This convenience library is solely to avoid compiler warnings +# in its generated sources. +libprotocol_la_SOURCES = \ + guestfs_protocol.c \ + guestfs_protocol.h + +libprotocol_la_CFLAGS = -Wall -Wno-unused + $(BUILT_SOURCES): stamp-generator CLEANFILES = guestfs_protocol.c guestfs_protocol.h @@ -98,13 +106,15 @@ libguestfs_la_LDFLAGS = -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR) libguestfs_...

On Wednesday, 25 January 2017 14:37:10 CET Richard W.M. Jones wrote: > This commit, which is just code motion, moves the common XDR protocol > code (libprotocol) and the common errno handling (liberrnostring) into > libraries which are each built once and shared between the library and > daemon. > --- > guestfsd_SOURCES = \ > + ../common/errnostring/errnostring.h \ > + ../common/protocol/guestfs_protocol.h \ > [...] > libguestfs...

--- daemon/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e23ce86..af075d7 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing -guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c +guestfs_protocol.c: $(srcdir)/guestfs_protocol.c rm -f $@ ln $< $@ -guestfs_protocol.h: $(libsrcdir)/guestfs...

These patches first make src/ warning free, and then turn on the strict warning options. 75 0001-build-suppress-an-ignored-write-return-value-warning.patch 38 0002-build-suppress-an-ignored-dup-return-value-warning.patch 27 0003-generator.ml-suppress-signed-unsigned-compare-warnin.patch 48 0004-build-don-t-perform-arithmetic-on-void-pointers.patch 30

...race userspace probes (optional). dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3a698cc..5e4db57 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -167,6 +167,7 @@ guestfsd_LDADD = \ liberrnostring.a \ libprotocol.a \ $(SELINUX_LIB) \ + $(LIBBLKID) \ $(AUGEAS_LIBS) \ $(top_builddir)/gnulib/lib/.libs/libgnu.a \ $(GETADDRINFO_LIB) \ diff --git a/daemon/blkid.c b/daemon/blkid.c index 8728c29..0c4ca71 100644 --- a/daemon/blkid.c +++ b/daemon/blkid.c @@ -23,6 +23,8 @@ #include <string.h> #include...

...n/utils \ -I$(top_srcdir)/server nbdkit_nbd_plugin_la_CFLAGS = \ $(WARNINGS_CFLAGS) @@ -50,7 +51,8 @@ nbdkit_nbd_plugin_la_LDFLAGS = \ -module -avoid-version -shared \ -Wl,--version-script=$(top_srcdir)/plugins/plugins.syms nbdkit_nbd_plugin_la_LIBADD = \ - $(top_builddir)/common/protocol/libprotocol.la + $(top_builddir)/common/protocol/libprotocol.la \ + $(top_builddir)/common/utils/libutils.la if HAVE_POD -- 2.20.1

I needed to add a few patches to be able to build libguestfs 1.20.2 out of tree. Mostly srcdir/builddir issues -- I think that I had posted something for building the daemon before. As mentioned on IRC, I found that compiling (Ruby bindings) caused config.h file shipped with the Ruby headers to be included rather than ${builddir}/config.h. This can be fixed because the relevant checks can be

.../Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/protocol/Makefile.am b/common/protocol/Makefile.am index cfac2d8d375f..778758209d4c 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -34,7 +34,8 @@ noinst_LTLIBRARIES = libprotocol.la # warnings here. libprotocol_la_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_la_CFLAGS = \ - -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) + -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) \ + $(RPC_CFLAGS) if HAVE_RPCGEN diff --git a/fi...

...iff --git a/common/protocol/Makefile.am b/common/protocol/Makefile.am index 74c288a..b115c58 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -37,6 +37,8 @@ EXTRA_DIST = \ generate-protostrings.sh \ $(NULL) +include_HEADERS = nbd-protocol.h + noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ diff --git a/common/protocol/nbd-protocol.h b/common/protocol/nbd-protocol.h index 724ffb6..7df411a 100644 --- a/common/protocol/nbd-protocol.h +++ b/common/protocol/nbd-protocol.h @@ -36,10 +36,16 @@ #include <stdint.h> /* Note that all NBD fields are sen...

...m index 99df43b..996be26 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -32,7 +32,7 @@ include $(top_srcdir)/common-rules.mk EXTRA_DIST = \ - protocol.h \ + nbd-protocol.h \ protostrings.c \ protostrings.sed \ $(NULL) @@ -41,16 +41,16 @@ noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ protostrings.c \ - protocol.h \ + nbd-protocol.h \ $(NULL) libprotocol_la_CFLAGS = $(WARNINGS_CFLAGS) -# protostrings.c is generated from the protocol.h header file where it -# is used to map NBD protocol flags to strings. +# protostrings.c is generate...

We should have only one NBD protocol file. Let's make nbdkit's version the canonical one, and use it in libnbd. Rich.

...ile.am @@ -187,7 +187,8 @@ guestfsd_LDFLAGS = \ -L$(shell $(OCAMLC) -where) \ -L$(shell $(OCAMLC) -where)/hivex \ -L../common/mlutils \ - -L../common/mlstdutils + -L../common/mlstdutils \ + -L../common/mlpcre guestfsd_LDADD = \ ../common/errnostring/liberrnostring.la \ ../common/protocol/libprotocol.la \ @@ -293,7 +294,9 @@ OCAMLPACKAGES = \ -package str,unix,hivex \ -I $(top_srcdir)/common/mlstdutils \ -I $(top_srcdir)/common/mlutils \ - -I $(top_builddir)/common/utils/.libs + -I $(top_builddir)/common/utils/.libs \ + -I $(top_srcdir)/common/mlpcre \ + -I $(top_builddir)/common/mlpcre/....

...bdkit_CFLAGS = \ +libnbdkit_la_CFLAGS = \ $(PTHREAD_CFLAGS) \ $(WARNINGS_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(LIBSELINUX_CFLAGS) \ $(VALGRIND_CFLAGS) \ $(NULL) -nbdkit_LDADD = \ +libnbdkit_la_LIBADD = \ $(GNUTLS_LIBS) \ $(LIBSELINUX_LIBS) \ $(DL_LIBS) \ $(top_builddir)/common/protocol/libprotocol.la \ $(top_builddir)/common/utils/libutils.la \ $(NULL) -nbdkit_LDFLAGS = \ +libnbdkit_la_LDFLAGS = \ + -shared $(NO_UNDEFINED_ON_WINDOWS) \ $(PTHREAD_LIBS) \ $(DL_LDFLAGS) \ $(NULL) @@ -109,7 +114,7 @@ if USE_LINKER_SCRIPT_FOR_SERVER # adds loads of fuzzer and ASAN-related symbols that...

...le.am index 996be26..74c288a 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -34,13 +34,14 @@ include $(top_srcdir)/common-rules.mk EXTRA_DIST = \ nbd-protocol.h \ protostrings.c \ - protostrings.sed \ + generate-protostrings.sh \ $(NULL) noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ protostrings.c \ + protostrings.h \ nbd-protocol.h \ $(NULL) libprotocol_la_CFLAGS = $(WARNINGS_CFLAGS) @@ -50,8 +51,9 @@ libprotocol_la_CFLAGS = $(WARNINGS_CFLAGS) BUILT_SOURCES = protostrings.c CLEANFILES += protostrings.c -protostrings.c: nbd-pr...

This is just an initial version of the patch, not to be applied. It implements just the diskgroup functions, ie. corresponding to these ldmtool commands: * ldmtool scan * ldmtool show diskgroup <guid> I have chosen yajl as the JSON parsing library (don't worry, this is optional). You will also, of course, need ldmtool which is not packaged in anything except Fedora. Rich.

There's more that can be done (in particular, use of CLEANUP_FREE), but this is enough to at least see if I'm on the right track. I couldn't figure out an obvious difference between common/include and common/utils, but it looks like the former is for things that are inlineable via .h only, while the latter is when you need to link in a convenience library, so this landed in the

This adds most of the hivex APIs directly to the libguestfs API, so that you can read and write Windows Registry hive files from libguestfs without needing to download and upload hive files from the guest. This is analogous to how Augeas APIs are exposed already (guestfs_aug_*) Also, inspection is now done using the new APIs, which fixes the following bug:

...s only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol src/liberrnostring -> common/errnostring src/utils -> common/utils cat/visit -> common/visit fish/[various] -> common/options src -> lib I'm planning some other changes in future patches, assuming I have the energy as this is rather tedious work:...