search for: liberrnostr

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 +++++++++++++++++++++++++++++ common/protocol/Makefile.am | 60 +++++++++++++...

...rtions(+), 4 deletions(-) diff --git a/daemon/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 \ + ../...

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_la_SOURCES = \ > + ../common/errnostring...

...heck for systemtap/DTrace 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 <st...

...-- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -214,7 +214,7 @@ guestfsd_LDFLAGS = \ -L$(shell $(OCAMLC) -where)/hivex \ -L../common/mlutils \ -L../common/mlstdutils \ - -L../common/mlaugeas \ + -L../3rdparty/ocaml-augeas \ -L../common/mlpcre guestfsd_LDADD = \ ../common/errnostring/liberrnostring.la \ @@ -341,7 +341,7 @@ XOBJECTS = $(BOBJECTS:.cmo=.cmx) OCAMLPACKAGES = \ -package str,unix,hivex \ - -I $(top_builddir)/common/mlaugeas \ + -I $(top_builddir)/3rdparty/ocaml-augeas \ -I $(top_builddir)/common/mlstdutils \ -I $(top_builddir)/common/mlutils \ -I $(top_builddir)/commo...

...- a/daemon/Makefile.am +++ b/daemon/Makefile.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/mlpc...

...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: df/parallel -> common/parallel d...

...on/utils/cleanups.h \ + ../common/utils/utils.h \ 9p.c \ acl.c \ actions.h \ @@ -62,7 +64,6 @@ guestfsd_SOURCES = \ cap.c \ checksum.c \ cleanups.c \ - cleanups.h \ cmp.c \ command.c \ command.h \ @@ -178,6 +179,7 @@ guestfsd_SOURCES = \ guestfsd_LDADD = \ ../common/errnostring/liberrnostring.la \ ../common/protocol/libprotocol.la \ + ../common/utils/libutils.la \ $(ACL_LIBS) \ $(CAP_LIBS) \ $(YAJL_LIBS) \ @@ -206,7 +208,9 @@ guestfsd_CPPFLAGS = \ -I$(top_srcdir)/common/errnostring \ -I$(top_builddir)/common/errnostring \ -I$(top_srcdir)/common/protocol \ - -I$(top_buil...

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.

Hi Rich I using ubuntu 13.10 with powerpc arch. I tried the above stepss and below are the output of the related commands.. nm -D /usr/lib/powerpc-linux-gnu/libtinfo.so | grep tgetent 0000def0 T tgetent ubuntu@t4240-ubuntu1310:~$ dpkg -S /usr/lib/powerpc-linux-gnu/libtinfo.so libtinfo-dev:powerpc: /usr/lib/powerpc-linux-gnu/libtinfo.so However I'm not able to perform rm -f config.cache

...x b26c43ed2..3e8bdb44f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -190,6 +190,7 @@ guestfsd_LDFLAGS = \ -L$(shell $(OCAMLC) -where)/hivex \ -L../common/mlutils \ -L../common/mlstdutils \ + -L../common/mlaugeas \ -L../common/mlpcre guestfsd_LDADD = \ ../common/errnostring/liberrnostring.la \ @@ -294,6 +295,7 @@ XOBJECTS = $(BOBJECTS:.cmo=.cmx) OCAMLPACKAGES = \ -package str,unix,hivex \ + -I $(top_srcdir)/common/mlaugeas \ -I $(top_srcdir)/common/mlstdutils \ -I $(top_srcdir)/common/mlutils \ -I $(top_builddir)/common/utils/.libs \ @@ -314,6 +316,7 @@ OCAML_LIBS = \...

...lt;< + "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE=1 " << "@WARN_CFLAGS@ @WERROR_CFLAGS@" create_header diff --git a/src/Makefile.am b/src/Makefile.am index 1057245..acdbe74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -195,7 +195,7 @@ libguestfs_la_LIBADD += liberrnostring.la libprotocol.la libguestfs_la_CFLAGS = \ -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \ -DGUESTFS_WARN_DEPRECATED=1 \ - -DGUESTFS_PRIVATE_FUNCTIONS=1 \ + -DGUESTFS_PRIVATE=1 \ -DLIBOSINFO_DB_PATH='"$(datadir)/libosinfo/db"' \ $(WARN_CFLAGS) $(WERROR...

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:

...ile.am b/lib/Makefile.am index 91c4e0a2e..d075174d9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -141,7 +141,7 @@ libguestfs_la_CFLAGS = \ $(PCRE_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBXML2_CFLAGS) \ - $(YAJL_CFLAGS) + $(JANSSON_CFLAGS) libguestfs_la_LIBADD = \ ../common/errnostring/liberrnostring.la \ @@ -152,7 +152,7 @@ libguestfs_la_LIBADD = \ $(PCRE_LIBS) \ $(LIBVIRT_LIBS) $(LIBXML2_LIBS) \ $(SELINUX_LIBS) \ - $(YAJL_LIBS) \ + $(JANSSON_LIBS) \ ../gnulib/lib/libgnu.la \ $(GETADDRINFO_LIB) \ $(HOSTENT_LIB) \ diff --git a/lib/info.c b/lib/info.c index 93fadcd39..2eadc1c11 10...

...ile.am b/lib/Makefile.am index a1d8ee70e..6e97a4844 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -141,7 +141,7 @@ libguestfs_la_CFLAGS = \ $(PCRE_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBXML2_CFLAGS) \ - $(YAJL_CFLAGS) + $(JANSSON_CFLAGS) libguestfs_la_LIBADD = \ ../common/errnostring/liberrnostring.la \ @@ -152,7 +152,7 @@ libguestfs_la_LIBADD = \ $(PCRE_LIBS) \ $(LIBVIRT_LIBS) $(LIBXML2_LIBS) \ $(SELINUX_LIBS) \ - $(YAJL_LIBS) \ + $(JANSSON_LIBS) \ ../gnulib/lib/libgnu.la \ $(GETADDRINFO_LIB) \ $(HOSTENT_LIB) \ diff --git a/lib/info.c b/lib/info.c index f7378adfd..ada4cf03c 10...

Hi, recently, there was a discussion in the development list of libvirt on switching to a different JSON library than YAJL [1]. Since we use YAJL, and the points there IMHO apply to libguestfs as well, I decided to give a try in switching to Jansson [2]. The result IMHO is nice, with the additional APIs of Jansson that simplify some of our code. Unlike with YAJL, I did not set a minimum

...r.h-t wctype.h wctype.h-t rmdir arpa rmdir sys make[3]: Leaving directory `/home/rjones/d/libguestfs/daemon/lib' make[2]: Leaving directory `/home/rjones/d/libguestfs/daemon/lib' Making clean in . make[2]: Entering directory `/home/rjones/d/libguestfs/daemon' test -z "libprotocol.a liberrnostring.a" || rm -f libprotocol.a liberrnostring.a test -z "guestfsd" || rm -f guestfsd rm -f *.o make[2]: Leaving directory `/home/rjones/d/libguestfs/daemon' make[1]: Leaving directory `/home/rjones/d/libguestfs/daemon' Making clean in po make[1]: Entering directory `/home/rjone...

...r.h-t wctype.h wctype.h-t rmdir arpa rmdir sys make[3]: Leaving directory `/home/rjones/d/libguestfs/daemon/lib' make[2]: Leaving directory `/home/rjones/d/libguestfs/daemon/lib' Making clean in . make[2]: Entering directory `/home/rjones/d/libguestfs/daemon' test -z "libprotocol.a liberrnostring.a" || rm -f libprotocol.a liberrnostring.a test -z "guestfsd" || rm -f guestfsd rm -f *.o make[2]: Leaving directory `/home/rjones/d/libguestfs/daemon' make[1]: Leaving directory `/home/rjones/d/libguestfs/daemon' Making clean in po make[1]: Entering directory `/home/rjone...

...n/qemuopts \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ + -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib libguestfs_la_CFLAGS = \ @@ -152,6 +153,7 @@ libguestfs_la_LIBADD = \ ../common/errnostring/liberrnostring.la \ ../common/protocol/libprotocol.la \ ../common/qemuopts/libqemuopts.la \ + ../common/structs/libstructs.la \ ../common/utils/libutils.la \ $(PCRE_LIBS) $(MAGIC_LIBS) \ $(LIBVIRT_LIBS) $(LIBXML2_LIBS) \ @@ -213,6 +215,7 @@ unit_tests_SOURCES = unit-tests.c unit_tests_CPPFLAGS = \...

...r.h-t wctype.h wctype.h-t rmdir arpa rmdir sys make[3]: Leaving directory `/home/rjones/d/libguestfs/daemon/lib' make[2]: Leaving directory `/home/rjones/d/libguestfs/daemon/lib' Making clean in . make[2]: Entering directory `/home/rjones/d/libguestfs/daemon' test -z "libprotocol.a liberrnostring.a" || rm -f libprotocol.a liberrnostring.a test -z "guestfsd" || rm -f guestfsd rm -f *.o make[2]: Leaving directory `/home/rjones/d/libguestfs/daemon' make[1]: Leaving directory `/home/rjones/d/libguestfs/daemon' Making clean in po make[1]: Entering directory `/home/rjone...