search for: cd859139d

...hus letting other fall through. In reality this ought to not happen at all, so help GCC by break'ing the case, which will then lead to the abort() at the end of guestfs_int_drive_source_qemu_param. --- lib/qemu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/qemu.c b/lib/qemu.c index cd859139d..a50eca988 100644 --- a/lib/qemu.c +++ b/lib/qemu.c @@ -746,6 +746,7 @@ guestfs_int_drive_source_qemu_param (guestfs_h *g, return make_uri (g, "gluster+unix", NULL, NULL, &src->servers[0], NULL); } + break; case drive_protocol_http:...

...SON parse error: %s"), parse_error); + if (strlen (err.text) > 0) + error (g, _("qemu-img info: JSON parse error: %s"), err.text); else error (g, _("qemu-img info: unknown JSON parse error")); } diff --git a/lib/qemu.c b/lib/qemu.c index 095d27d0a..cd859139d 100644 --- a/lib/qemu.c +++ b/lib/qemu.c @@ -37,7 +37,7 @@ #include <libxml/uri.h> -#include <yajl/yajl_tree.h> +#include <jansson.h> #include "full-write.h" #include "ignore-value.h" @@ -57,7 +57,7 @@ struct qemu_data { /* The following fields ar...

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