search for: f7378adfd

...- > lib/qemu.c | 64 +++++++------------- > m4/guestfs-libraries.m4 | 4 +- > 13 files changed, 170 insertions(+), 234 deletions(-) > This is nice, just one idea below that might be useful to you. >diff --git a/lib/info.c b/lib/info.c >index f7378adfd..ada4cf03c 100644 >--- a/lib/info.c >+++ b/lib/info.c >@@ -38,53 +38,46 @@ > #include <sys/resource.h> > #endif > >-#include <yajl/yajl_tree.h> >+#include <jansson.h> > > #include "guestfs.h" > #include "guestfs-internal.h" >...

...tps://www.redhat.com/archives/libguestfs/2017-November/thread.html#00226 https://www.redhat.com/archives/libguestfs/2017-December/thread.html#00044 --- lib/info.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/lib/info.c b/lib/info.c index f7378adfd..c58b3ebfb 100644 --- a/lib/info.c +++ b/lib/info.c @@ -24,7 +24,6 @@ #include <fcntl.h> #include <unistd.h> #include <sys/types.h> -#include <sys/stat.h> #include <sys/wait.h> #include <assert.h> #include <string.h> @@ -166,41 +165,24 @@ static yajl_...

v1 posted here: https://www.redhat.com/archives/libguestfs/2017-December/msg00050.html v2 fixes the tests by rewriting relative paths as ./filename (so that filenames like "file:foo" work).

...https://www.redhat.com/archives/libguestfs/2017-November/thread.html#00226 https://www.redhat.com/archives/libguestfs/2017-December/thread.html#00044 --- lib/info.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/lib/info.c b/lib/info.c index f7378adfd..f146dcbfc 100644 --- a/lib/info.c +++ b/lib/info.c @@ -24,7 +24,6 @@ #include <fcntl.h> #include <unistd.h> #include <sys/types.h> -#include <sys/stat.h> #include <sys/wait.h> #include <assert.h> #include <string.h> @@ -166,41 +165,18 @@ static yajl_...

...estfs_int_cmd_run (cmd); if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) { - guestfs_int_external_command_failed (g, r, "qemu-img", orig_filename); + guestfs_int_external_command_failed (g, r, QEMU_IMG, orig_filename); return -1; } diff --git a/lib/info.c b/lib/info.c index f7378adfd..4464df994 100644 --- a/lib/info.c +++ b/lib/info.c @@ -191,7 +191,7 @@ get_json_output (guestfs_h *g, const char *filename) snprintf (fdpath, sizeof fdpath, "/dev/fd/%d", fd); guestfs_int_cmd_clear_close_files (cmd); - guestfs_int_cmd_add_arg (cmd, "qemu-img"); + gues...

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

On Thu, Nov 23, 2017 at 02:05:32PM +0000, Richard W.M. Jones wrote: > On Thu, Nov 23, 2017 at 03:00:45PM +0200, Yaniv Kaul wrote: > > On Thu, Nov 23, 2017 at 10:57 AM, Richard W.M. Jones <rjones@redhat.com> > > wrote: > > > > > On Tue, Nov 21, 2017 at 11:43:54PM +0200, Yaniv Kaul wrote: > > > > Since I upgrading to FC27, I *sometimes* fail to

...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 100644 --- a/lib/info.c +++ b/lib/info.c @@ -38,53 +38,46 @@ #include <sys/resource.h> #endif -#include <yajl/yajl_tree.h> +#include <jansson.h> #include "guestfs.h" #include "guestfs-internal.h" #include "guestfs-internal-actions.h&quo...

...ot;)); if (guestfs_int_set_backend (g, "direct") == -1) { - warning (g, _("'direct' backend does not work")); + warning (g, _("‘direct’ backend does not work")); goto error; } } diff --git a/lib/info.c b/lib/info.c index 979173066..f7378adfd 100644 --- a/lib/info.c +++ b/lib/info.c @@ -87,7 +87,7 @@ guestfs_impl_disk_format (guestfs_h *g, const char *filename) } bad_type: - error (g, _("qemu-img info: JSON output did not contain 'format' key")); + error (g, _("qemu-img info: JSON output did not contain ‘...