search for: libvirt_cflag

...), 4 deletions(-) diff --git a/mltools/Makefile.am b/mltools/Makefile.am index ce4d1ac..3b4172d 100644 --- a/mltools/Makefile.am +++ b/mltools/Makefile.am @@ -103,7 +103,9 @@ libmltools_a_CPPFLAGS = \ -I$(top_srcdir)/common/mlutils libmltools_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ + $(LIBVIRT_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(JANSSON_CFLAGS) \ -fPIC diff --git a/mlutils/Makefile.am b/mlutils/Makefile.am index e86d7bb..38a683f 100644 --- a/mlutils/Makefile.am +++ b/mlutils/Makefile.am @@ -63,7 +63,8 @@ libmlcutils_a_CPPFLAG...

...hanged, 2 insertions(+) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 2a196d45d..104420d13 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -197,6 +197,7 @@ 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

...;= 145) # Checks for library functions. AC_CHECK_FUNCS([gethostname inet_ntoa socket]) diff --git a/src/Makefile.am b/src/Makefile.am index ee30443..b4668b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src/qmf/com/redhat/matahari $(HAL_CFLAGS) $(LIBVIRT_CFLAGS) $(PCRE_CFLAGS) +INCLUDES = -I$(top_srcdir)/src/qmf/com/redhat/matahari $(HAL_CFLAGS) $(LIBVIRT_CFLAGS) $(PCRE_CFLAGS) $(UDEV_CFLAGS) sbin_PROGRAMS = matahari @@ -41,6 +41,6 @@ CLEANFILES = $(generated_file_list) $(first) matahari_CPPFLAGS = -fno-strict-aliasing matahari_LDFLAGS = -L/usr/...

...f3cea820 100644 --- a/common/mlaugeas/Makefile.am +++ b/common/mlaugeas/Makefile.am @@ -53,7 +53,7 @@ libmlaugeas_a_CPPFLAGS = \ -I$(top_builddir) \ -I$(shell $(OCAMLC) -where) libmlaugeas_a_CFLAGS = \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(WARN_CFLAGS) $(NO_SNV_CFLAGS) $(WERROR_CFLAGS) \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ -fPIC diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4 index 6621a2747..13310d5db 100644 --- a/m4/guestfs-c.m4 +++ b/m4/guestfs-c.m4 @@ -105,6 +105,12 @@ gl_WARN_ADD([-Wformat-truncation=1]) AC_SUBST([WARN_CFLAGS]) +NO_SNV_CFLAGS= +gl_COMPILER_OPTION_IF([-Wno-shift-nega...

...s.ml \ name_from_disk.ml \ @@ -103,8 +99,7 @@ SOURCES_ML = \ SOURCES_C = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c if HAVE_OCAML @@ -118,7 +113,6 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/src virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) BOBJECTS = \ @@ -166,8 +160,7 @@ virt_v2v_LINK = \ virt_v2v_copy_to_local_SOURCES = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c virt_v2v_copy_to_local_CPPFLAGS = \ -I. \ -I$(top_builddir) \ @@ -175,12 +168,9 @@ virt_v2v_copy_to_local_CPPFLAGS = \ -I$(top_srcdir)/src virt...

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

...parallel.h \ - ../fish/config.c \ ../fish/decrypt.c \ ../fish/display-options.h \ ../fish/display-options.c \ @@ -59,12 +58,10 @@ virt_alignment_scan_CPPFLAGS = \ virt_alignment_scan_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBCONFIG_CFLAGS) \ $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) virt_alignment_scan_LDADD = \ - $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libutils.la \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ diff --git a/df/Makefile.am b/df/Makefile.am index 6efc1dc..f4a8602 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST =...

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

...omize/Makefile.am b/customize/Makefile.am index b4ec9286a..a22e25c46 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -100,6 +100,7 @@ libcustomize_a_CPPFLAGS = \ -I$(top_srcdir)/common/edit libcustomize_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBCRYPT_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBXML2_CFLAGS) \ -fPIC diff --git a/customize/crypt-c.c b/customize/crypt-c.c index 70e6ea7f5..d5425cfaa 100644 --- a/customize/crypt-c.c +++ b/customize/crypt-c.c @@ -22,6 +22,10 @@ #include <stdlib.h> #include <unistd.h> +#if HAVE_CRYPT_H +#include <crypt.h> +#end...

...efile.am b/v2v/Makefile.am > index 2a196d45d..104420d13 100644 > --- a/v2v/Makefile.am > +++ b/v2v/Makefile.am > @@ -197,6 +197,7 @@ 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) \ LGTM. Thanks, -- Pino Toscano

...GS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) .PHONY: force diff --git a/src/Makefile.am b/src/Makefile.am index 761fcb6..82a4004 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,7 +165,7 @@ libguestfs_la_CFLAGS = \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) -libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib +libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib if HAVE_RPCGEN guestfs_protocol.c: guestfs_protocol.x -- 1.7.7.3

...r LIBVIRT... no configure: error: Package requirements (libvirt >= 0.10.2) were not met: No package 'libvirt' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBVIRT_CFLAGS and LIBVIRT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. The only "libraries" I have been able to find are: $ cp /usr/local/bin/cygvirt- cygvirt-0.dll cygvirt-lxc-0.dll cygvirt-qemu-0.dll Copying it to /usr/lib doesn't cha...

...s.ml \ name_from_disk.ml \ @@ -103,8 +99,7 @@ SOURCES_ML = \ SOURCES_C = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c if HAVE_OCAML @@ -119,7 +114,6 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/lib virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) BOBJECTS = \ @@ -168,8 +162,7 @@ virt_v2v_LINK = \ virt_v2v_copy_to_local_SOURCES = \ domainxml-c.c \ - utils-c.c \ - xml-c.c + utils-c.c virt_v2v_copy_to_local_CPPFLAGS = \ -I. \ -I$(top_builddir) \ @@ -178,12 +171,9 @@ virt_v2v_copy_to_local_CPPFLAGS = \ -I$(top_srcdir)/lib virt...

...ent_scan_SOURCES = \ virt_alignment_scan_CPPFLAGS = \ -DGUESTFS_WARN_DEPRECATED=1 \ + -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/df \ -I$(top_srcdir)/fish \ @@ -52,7 +53,7 @@ virt_alignment_scan_CFLAGS = \ $(LIBVIRT_CFLAGS) virt_alignment_scan_LDADD = \ - $(top_builddir)/src/libutils.la \ + $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/src/libguestfs.la \ $(top_builddir)/fish/libfishcommon.la \ $(LIBXML2_LIBS) \ diff --git a/builder/Makefile.am b/builder/Makefile.am index 2a9f89b..85c754f 10064...

.../libguestfs.la -if HAVE_LIBVIRT -rhbz1044014_SOURCES = rhbz1044014.c -rhbz1044014_CPPFLAGS = \ - -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/src -I$(top_builddir)/src -rhbz1044014_CFLAGS = \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(GPROF_CFLAGS) $(GCOV_CFLAGS) \ - $(LIBVIRT_CFLAGS) -rhbz1044014_LDADD = \ - $(top_builddir)/src/libutils.la \ - $(top_builddir)/src/libguestfs.la \ - $(LIBVIRT_LIBS) \ - $(LIBXML2_LIBS) \ - $(top_builddir)/gnulib/lib/libgnu.la -endif - rhbz1055452_SOURCES = rhbz1055452.c rhbz1055452_CPPFLAGS = \ -I$(top_srcd...

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 +-

Since there are deprecated APIs, make sure that users notice they are deprecated in more prominent ways than done so far: - using deprecated C functions now warns by default - it is possible to use the C library making sure no deprecated function is ever used - Python/Ruby/Perl scripts now get warning messages (configured according to their own systems) when deprecated functions are used The

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

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

...GS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/common/visit \ -I$(top_srcdir)/common/options \ - -I$(top_srcdir)/common/progress + -I$(top_srcdir)/common/progress \ + -DLIBOSINFO_DB_PATH='"$(datadir)/libosinfo/db"' libmllib_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ diff --git a/mllib/osinfo-c.c b/mllib/osinfo-c.c new file mode 100644 index 000000000..9546c5984 --- /dev/null +++ b/mllib/osinfo-c.c @@ -0,0 +1,100 @@ +/* Bindings for osinfo db reading function. + * Copyright (C) 2017 SUSE Inc. + * + * This program is free software; you can...