search for: guestfs_protocol

...13d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -116,6 +116,13 @@ Makefile.in /cat/virt-tail /cat/virt-tail.1 /ChangeLog +/common/errnostring/errnostring.c +/common/errnostring/errnostring-gperf.c +/common/errnostring/errnostring-gperf.gperf +/common/errnostring/errnostring.h +/common/protocol/guestfs_protocol.c +/common/protocol/guestfs_protocol.h +/common/protocol/guestfs_protocol.x /compile /config.cache /config.guess @@ -139,15 +146,9 @@ Makefile.in /customize/virt-customize.1 /daemon/actions.h /daemon/dispatch.c -/daemon/errnostring.c -/daemon/errnostring-gperf.c -/daemon/errnostring-gperf.gpe...

--- 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_protocol.h +guestfs_protocol.h: $(srcdir)/g...

Recently we changed the daemon so it builds guestfs_protocol.o by this rule: $(libsrcdir)/guestfs_protocol.o: force $(MAKE) -C $(libsrcdir) guestfs_protocol.o guestfsd_LDADD = \ $(libsrcdir)/guestfs_protocol.o \ #... The problem with doing this when building on Windows is that the toplevel src/ directory will be configured differently from...

I haven't received this yet, but read from the archive: https://www.redhat.com/archives/libguestfs/2009-November/msg00268.html The only suspicious part is the trailing ".c" on the command below: +$(libsrcdir)/guestfs_protocol.c: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.c +$(libsrcdir)/guestfs_protocol.h: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.c Shouldn't that be .h?

...13 12:56 PM, Richard W.M. Jones wrote: > > F20 - it's in the beta now (as of yesterday). > > > > Rich. > > Wow this has a lot of dependencies :) Two questions... Let's put this on the mailing list so others can help. > Do I need OCaml installed? > Where does guestfs_protocol.x come from? > > I checked out the master branch from github and tried compiling that. > > Warning: Install OCaml compiler in order to rebuild the generated files. > touch stamp-generator > make[2]: Leaving directory `/tmp/libguestfs/generator' > Making all in src > mak...

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

...ollowing error: "make[2]: Leaving directory '/home/matador/AUR/libguestfs-git/src/libguestfs/common/errnostring' Making all in common/protocol make[2]: Entering directory '/home/matador/AUR/libguestfs-git/src/libguestfs/common/protocol' make[2]: *** No rule to make target 'guestfs_protocol.c', needed by 'all'. Stop. make[2]: Leaving directory '/home/matador/AUR/libguestfs-git/src/libguestfs/common/protocol' make[1]: *** [Makefile:2380: all-recursive] Error 1 make[1]: Leaving directory '/home/matador/AUR/libguestfs-git/src/libguestfs' make: *** [Makefile:22...

...ry file it generates, except java files. Java is left for another time because it's considerably trickier. This fixes parallel make, and will automatically re-create generated files when make is run from any directory. It also fixes the problem which efad4f53 was targetting. Specifically, src/guestfs_protocol.(c|h) had an erroneous dependency on stamp-generator, and therefore generator.ml, despite not being directly created by it. This caused them to be recreated every time generator.ml ran rather than only when src/guestfs_protocol.x was updated, which cascaded into a daemon and therefore appliance upd...

.../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_la_SOURCES = \ guestfs.c \ gues...

...rt.c @@ -22,13 +22,9 @@ #include <stdio.h> #include <stdlib.h> -#include <stdint.h> -#include <string.h> -#include <unistd.h> #include "guestfs.h" #include "guestfs-internal.h" -#include "guestfs-internal-actions.h" #include "guestfs_protocol.h" /* Check the return message from a call for validity. */ diff --git a/src/alloc.c b/src/alloc.c index 821fe18..76e043e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -23,9 +23,6 @@ #include <unistd.h> #include <string.h> -#include <libxml/tree.h> -#include <libxml...

...was trying to compile it from the AUR repository ( > https://aur.archlinux.org/packages/libguestfs-git/) when I came across this > problem. > Now, answering your question: > *1. Are there any files under common/ ?* > Yes. There are several files there in, including Makefile.am, > guestfs_protocol.x, but not guestfs_protocol.c or guestfs_protocol.h > > However, I was talking to the package maintainer and he's stated that > > > rpcgen is used to create the files that are missed in your builds: > > > > $ grep -n rpcgen makepkg.out > > 3426:checking for rp...

This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.

--- generator/c.ml | 2 -- 1 file changed, 2 deletions(-) diff --git a/generator/c.ml b/generator/c.ml index 055b683..963cf21 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1213,9 +1213,7 @@ and generate_client_actions hash () = #include <stdlib.h> #include <stdint.h> #include <inttypes.h> -#include <sys/types.h> #include <sys/stat.h> -#include

--- src/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f3abe35..c3b7392 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,6 +112,7 @@ libguestfs_la_SOURCES = \ guestfs-actions.c \ guestfs-bindtests.c \ guestfs-internal.h \ + guestfs-protocol.h \ gettext.h # Make libguestfs include the convenience

-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

...tures. */ "; - (* The structures are carefully written to have exactly the same - * in-memory format as the XDR structures that we use on the wire to - * the daemon. The reason for creating copies of these structures - * here is just so we don't have to export the whole of - * guestfs_protocol.h (which includes much unrelated and - * XDR-dependent stuff that we don't want to be public, or required - * by clients). - * - * To reiterate, we will pass these structures to and from the client - * with a simple assignment or memcpy, so the format must be - * identical to what r...

Patch 1/5 is a repost. Only change is title update. These fix parallel make on my machine, and additionally make building from subdirectories more correct.

...ts/mountable/test-internal-parse-mountable.c | 1 + tests/regressions/rhbz914931.c | 1 + 15 files changed, 58 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 633b39d..8235f77 100644 --- a/.gitignore +++ b/.gitignore @@ -505,6 +505,7 @@ Makefile.in /src/guestfs_protocol.c /src/guestfs_protocol.h /src/guestfs_protocol.x +/src/guestfs-private.h /src/guestfs-structs.pod /src/libguestfs.3 /src/libguestfs.pc diff --git a/generator/c.ml b/generator/c.ml index f0df5ea..4497c48 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -39,7 +39,13 @@ let is_public { visibi...

...++++++++++++++++++-------------- 7 files changed, 41 insertions(+), 57 deletions(-) diff --git a/common/protocol/Makefile.am b/common/protocol/Makefile.am index c426f26..eb935f6 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -36,25 +36,15 @@ libprotocol_la_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_la_CFLAGS = \ -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) -if HAVE_RPCGEN -RPCGEN_DEFS = -if HAVE_XDR_U_INT64_T -RPCGEN_DEFS += -DHAVE_XDR_U_INT64_T=1 -else -if HAVE_XDR_UINT64_T -RPCGEN_DEFS += -DHAVE_XDR_UINT64_T=1 -endif -endif - guestf...

...ves 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/errnostring.h \ > + ../common/protocol/guestfs_protocol.h \ Are these two changes needed? The targets already depend on the .la. -- Pino Toscano