search for: jansson_libs

...@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/lib virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBOSINFO_CFLAGS) @@ -230,6 +231,7 @@ endif OCAMLCLIBS = \ -lqemuopts \ + $(LIBGUESTFS_LIBS) \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ $(JANSSON_LIBS) \ -- 2.24.1

...AGS = \ $(LIBLZMA_CFLAGS) \ $(LIBTINFO_CFLAGS) \ $(LIBXML2_CFLAGS) \ - $(YAJL_CFLAGS) + $(JANSSON_CFLAGS) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) @@ -210,7 +210,7 @@ OCAMLCLIBS = \ $(LIBCRYPT_LIBS) \ $(LIBLZMA_LIBS) \ $(LIBXML2_LIBS) \ - $(YAJL_LIBS) \ + $(JANSSON_LIBS) \ $(LIBINTL) \ -lgnu diff --git a/builder/yajl-c.c b/builder/yajl-c.c index 3c2402e42..e53755f55 100644 --- a/builder/yajl-c.c +++ b/builder/yajl-c.c @@ -23,24 +23,17 @@ #include <caml/memory.h> #include <caml/mlvalues.h> -#include <yajl/yajl_tree.h> +#include <janss...

...AGS = \ $(LIBLZMA_CFLAGS) \ $(LIBTINFO_CFLAGS) \ $(LIBXML2_CFLAGS) \ - $(YAJL_CFLAGS) + $(JANSSON_CFLAGS) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) @@ -209,7 +209,7 @@ OCAMLCLIBS = \ $(LIBCRYPT_LIBS) \ $(LIBLZMA_LIBS) \ $(LIBXML2_LIBS) \ - $(YAJL_LIBS) \ + $(JANSSON_LIBS) \ $(LIBINTL) \ -lgnu diff --git a/builder/yajl-c.c b/builder/yajl-c.c index 3c2402e42..03fbced6e 100644 --- a/builder/yajl-c.c +++ b/builder/yajl-c.c @@ -23,24 +23,17 @@ #include <caml/memory.h> #include <caml/mlvalues.h> -#include <yajl/yajl_tree.h> +#include <janss...

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

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

...\ > $(WARN_CFLAGS) $(WERROR_CFLAGS) \ > + $(LIBGUESTFS_CFLAGS) \ > $(LIBVIRT_CFLAGS) \ > $(LIBOSINFO_CFLAGS) > > @@ -230,6 +231,7 @@ endif > > OCAMLCLIBS = \ > -lqemuopts \ > + $(LIBGUESTFS_LIBS) \ > $(LIBVIRT_LIBS) \ > $(LIBXML2_LIBS) \ > $(JANSSON_LIBS) \ LGTM. Thanks, -- Pino Toscano

...LIB_CLOCK_GETTIME) \ $(LIBINTL) \ - $(SERVENT_LIB) \ $(PCRE_LIBS) \ $(TSK_LIBS) \ $(RPC_LIBS) \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 95b5edb4e..97d3d8d6b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -154,15 +154,11 @@ libguestfs_la_LIBADD = \ $(SELINUX_LIBS) \ $(JANSSON_LIBS) \ ../gnulib/lib/libgnu.la \ - $(GETADDRINFO_LIB) \ - $(HOSTENT_LIB) \ - $(INET_NTOP_LIB) \ $(LIBSOCKET) \ $(LIB_CLOCK_GETTIME) \ $(LTLIBINTL) \ $(LTLIBTHREAD) \ $(LTLIBICONV) \ - $(SERVENT_LIB) \ $(RPC_LIBS) # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0...

...B) \ > $(PCRE_LIBS) \ > $(TSK_LIBS) \ > $(RPC_LIBS) \ > diff --git a/lib/Makefile.am b/lib/Makefile.am > index 95b5edb4e..97d3d8d6b 100644 > --- a/lib/Makefile.am > +++ b/lib/Makefile.am > @@ -154,15 +154,11 @@ libguestfs_la_LIBADD = \ > $(SELINUX_LIBS) \ > $(JANSSON_LIBS) \ > ../gnulib/lib/libgnu.la \ > - $(GETADDRINFO_LIB) \ > - $(HOSTENT_LIB) \ > - $(INET_NTOP_LIB) \ > $(LIBSOCKET) \ > $(LIB_CLOCK_GETTIME) \ > $(LTLIBINTL) \ > $(LTLIBTHREAD) \ > $(LTLIBICONV) \ > - $(SERVENT_LIB) \ > $(RPC_LIBS) > > # Force...

...LIB_CLOCK_GETTIME) \ $(LIBINTL) \ - $(SERVENT_LIB) \ $(PCRE_LIBS) \ $(TSK_LIBS) \ $(RPC_LIBS) \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 95b5edb4e..e5df96fe2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -154,15 +154,10 @@ libguestfs_la_LIBADD = \ $(SELINUX_LIBS) \ $(JANSSON_LIBS) \ ../gnulib/lib/libgnu.la \ - $(GETADDRINFO_LIB) \ - $(HOSTENT_LIB) \ - $(INET_NTOP_LIB) \ $(LIBSOCKET) \ $(LIB_CLOCK_GETTIME) \ $(LTLIBINTL) \ $(LTLIBTHREAD) \ - $(LTLIBICONV) \ - $(SERVENT_LIB) \ $(RPC_LIBS) # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0...

...name_from_disk.mli \ networks.mli \ @@ -139,6 +140,7 @@ SOURCES_ML = \ output_vdsm.ml \ inspect_source.ml \ target_bus_assignment.ml \ + measure_disk.ml \ networks.ml \ cmdline.ml \ v2v.ml @@ -203,6 +205,7 @@ OCAMLCLIBS = \ -lqemuopts \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ + $(JANSSON_LIBS) \ $(LIBINTL) \ -lgnu @@ -378,6 +381,7 @@ TESTS += \ test-v2v-oa-option.sh \ test-v2v-of-option.sh \ test-v2v-on-option.sh \ + test-v2v-print-estimate.sh \ test-v2v-print-source.sh \ test-v2v-sound.sh \ $(SLOW_TESTS) \ @@ -533,6 +537,7 @@ EXTRA_DIST += \ test-v2v-oa-option.sh \...

...name_from_disk.mli \ networks.mli \ @@ -139,6 +140,7 @@ SOURCES_ML = \ output_vdsm.ml \ inspect_source.ml \ target_bus_assignment.ml \ + measure_disk.ml \ networks.ml \ cmdline.ml \ v2v.ml @@ -203,6 +205,7 @@ OCAMLCLIBS = \ -lqemuopts \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ + $(JANSSON_LIBS) \ $(LIBINTL) \ -lgnu @@ -378,6 +381,7 @@ TESTS += \ test-v2v-oa-option.sh \ test-v2v-of-option.sh \ test-v2v-on-option.sh \ + test-v2v-print-estimate.sh \ test-v2v-print-source.sh \ test-v2v-sound.sh \ $(SLOW_TESTS) \ @@ -533,6 +537,7 @@ EXTRA_DIST += \ test-v2v-oa-option.sh \...

...name_from_disk.mli \ networks.mli \ @@ -139,6 +140,7 @@ SOURCES_ML = \ output_vdsm.ml \ inspect_source.ml \ target_bus_assignment.ml \ + measure_disk.ml \ networks.ml \ cmdline.ml \ v2v.ml @@ -203,6 +205,7 @@ OCAMLCLIBS = \ -lqemuopts \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ + $(JANSSON_LIBS) \ $(LIBINTL) \ -lgnu @@ -378,6 +381,7 @@ TESTS += \ test-v2v-oa-option.sh \ test-v2v-of-option.sh \ test-v2v-on-option.sh \ + test-v2v-print-estimate.sh \ test-v2v-print-source.sh \ test-v2v-sound.sh \ $(SLOW_TESTS) \ @@ -533,6 +537,7 @@ EXTRA_DIST += \ test-v2v-oa-option.sh \...

...name_from_disk.mli \ networks.mli \ @@ -139,6 +140,7 @@ SOURCES_ML = \ output_vdsm.ml \ inspect_source.ml \ target_bus_assignment.ml \ + measure_disk.ml \ networks.ml \ cmdline.ml \ v2v.ml @@ -203,6 +205,7 @@ OCAMLCLIBS = \ -lqemuopts \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ + $(JANSSON_LIBS) \ $(LIBINTL) \ -lgnu @@ -378,6 +381,7 @@ TESTS += \ test-v2v-oa-option.sh \ test-v2v-of-option.sh \ test-v2v-on-option.sh \ + test-v2v-print-estimate.sh \ test-v2v-print-source.sh \ test-v2v-sound.sh \ $(SLOW_TESTS) \ @@ -533,6 +537,7 @@ EXTRA_DIST += \ test-v2v-oa-option.sh \...

v4: - Same as v3, but depends on and uses new --machine-readable work. Rich.

v6: - Make the text output a bit nicer. - Changes as suggested to Measure_disk module temp file & json parsing. - Use jq to test JSON output. - Retest.

v5: - Normal output modified approx as suggested in previous email. - Machine readable output uses JSON.

This is an extended version of: https://www.redhat.com/archives/libguestfs/2019-September/msg00178.html It adds a couple of simple code changes, so it makes it possible to drop more modules. In addition, more unused modules were dropped. Pino Toscano (5): tests: switch away from xgetcwd daemon: move read_whole_file to common utils daemon: switch from read_file to read_whole_file daemon:

This patch series integrates libosinfo in virt-v2v to get the list of files for Windows from libosinfo, if possible. The actual data is still from virtio-win, just unpacked. Pino Toscano (3): build: require libosinfo v2v: add a minimal libosinfo interface v2v: try to get windows driver files from libosinfo m4/guestfs-v2v.m4 | 3 + v2v/Makefile.am | 9 +-

This is an extended version of: https://www.redhat.com/archives/libguestfs/2019-September/msg00288.html Apparently I forgot it on my tree, so I'm posting that series again, adding an extra cleanup more due to the v2v/common splits. Pino Toscano (6): tests: switch away from xgetcwd daemon: move read_whole_file to common utils daemon: switch from read_file to read_whole_file daemon:

This patch series integrates libosinfo in virt-v2v to get the list of files for Windows from libosinfo, if possible. The actual data is still from virtio-win, just unpacked. Changes from v1: - adapt to use the priority in libosinfo 1.7.0+ - filter out non-pre-installable drivers - collect all the drivers matching the requirements, not just the first, sorting them by priority like libosinfo does