- Devel - libvirt List Archives

[libvirt] [PATCH] cfg.mak: ignore trailing whitespace in gnulib local patches
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

The diff files in gnulib/local may well contain trailing whitespace. They are simply diff's of gnulib code which should not be modified to follow libvirt style rules. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 22de11ce43..bc8088d7c0 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1224,7 +1224,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \ ^(examples/|tools/virsh-edit\.c$$) exclude_file_name_regexp--sc_trailing_blank = \ - /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo$$ + /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*diff$$ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test|docs/js/.*\.js)$$ -- 2.14.3

1 0

[libvirt] [PATCH] gnulib: temporary hacks to deal with glibc libio.h removal
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

GLibc deprecated libio.h in 2.27 and has removed it in current code that will become 2.28. The latter is now in Fedora rawhide and this change breaks gnulib which mistakenly still relies on these ancient symbols. Add a local hack for gnulib until a proper fix is available upstream. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix gnulib/local/lib/fflush.c.diff | 33 +++++++++++++++++++++++++++++++++ gnulib/local/lib/fpurge.c.diff | 13 +++++++++++++ gnulib/local/lib/freading.c.diff | 13 +++++++++++++ gnulib/local/lib/fseeko.c.diff | 22 ++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 gnulib/local/lib/fflush.c.diff create mode 100644 gnulib/local/lib/fpurge.c.diff create mode 100644 gnulib/local/lib/freading.c.diff create mode 100644 gnulib/local/lib/fseeko.c.diff diff --git a/gnulib/local/lib/fflush.c.diff b/gnulib/local/lib/fflush.c.diff new file mode 100644 index 0000000000..fa0e2431bd --- /dev/null +++ b/gnulib/local/lib/fflush.c.diff @@ -0,0 +1,33 @@ +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0ff..5f617305a 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -32,8 +32,8 @@ + + #undef fflush + +- +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#define _IO_IN_BACKUP 0x100 ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + diff --git a/gnulib/local/lib/fpurge.c.diff b/gnulib/local/lib/fpurge.c.diff new file mode 100644 index 0000000000..1fd87d8bfa --- /dev/null +++ b/gnulib/local/lib/fpurge.c.diff @@ -0,0 +1,13 @@ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c7a..75cf34ca2 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ diff --git a/gnulib/local/lib/freading.c.diff b/gnulib/local/lib/freading.c.diff new file mode 100644 index 0000000000..c51e34dd6a --- /dev/null +++ b/gnulib/local/lib/freading.c.diff @@ -0,0 +1,13 @@ +diff --git a/lib/freading.c b/lib/freading.c +index 73c28acdd..b1c397016 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); diff --git a/gnulib/local/lib/fseeko.c.diff b/gnulib/local/lib/fseeko.c.diff new file mode 100644 index 0000000000..b2c061fc97 --- /dev/null +++ b/gnulib/local/lib/fseeko.c.diff @@ -0,0 +1,22 @@ +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab55f..542241bb2 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- 2.14.3

1 0

[libvirt] [PATCH] gnulib: update to latest upstream changeset
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial rule .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 7e7c5c7952..0404c9ae28 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 7e7c5c7952b7de1e33c8eba891cc425d5d8d7803 +Subproject commit 0404c9ae2845cbf93d71b295b67d6c8bd39382d8 -- 2.14.3

1 0

[libvirt] [PATCH 00/17] Split up the src/Makefile.am even more
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

This is a continuation of my previous work to split src/Makefile.am This series does all the other non-virt drivers and utility code directories. This is about as far as I'm intending to take it for now. This is for post-freeze obviously :) Daniel P. Berrangé (17): make: split interface driver build rules into interface/Makefile.inc.am make: split network driver build rules into network/Makefile.inc.am make: split nwfilter driver build rules into nwfilter/Makefile.inc.am make: split nodedev driver build rules into node_device/Makefile.inc.am make: split secret driver build rules into secret/Makefile.inc.am make: split storage driver build rules into storage/Makefile.inc.am make: split remote driver & daemon build rules into remote/Makefile.inc.am make: split XML conf build rules into conf/Makefile.inc.am make: split CPU build rules into cpu/Makefile.inc.am make: split security driver build rules into security/Makefile.inc.am make: split access driver build rules into access/Makefile.inc.am make: split logging daemon build rules into logging/Makefile.inc.am make: split lock daemon build rules into locking/Makefile.inc.am make: split admin driver build rules into admin/Makefile.inc.am make: split RPC build rules into rpc/Makefile.inc.am make: split util build rules into util/Makefile.inc.am make: split vmx driver build rules into vmx/Makefile.inc.am src/Makefile.am | 1993 +-------------------------------------- src/access/Makefile.inc.am | 148 +++ src/admin/Makefile.inc.am | 50 + src/conf/Makefile.inc.am | 163 ++++ src/cpu/Makefile.inc.am | 24 + src/interface/Makefile.inc.am | 42 + src/locking/Makefile.inc.am | 321 +++++++ src/logging/Makefile.inc.am | 155 +++ src/network/Makefile.inc.am | 106 +++ src/node_device/Makefile.inc.am | 65 ++ src/nwfilter/Makefile.inc.am | 42 + src/remote/Makefile.inc.am | 342 +++++++ src/rpc/Makefile.inc.am | 147 +++ src/secret/Makefile.inc.am | 38 + src/security/Makefile.inc.am | 80 ++ src/storage/Makefile.inc.am | 323 +++++++ src/util/Makefile.inc.am | 325 +++++++ src/vmx/Makefile.inc.am | 22 + 18 files changed, 2435 insertions(+), 1951 deletions(-) create mode 100644 src/access/Makefile.inc.am create mode 100644 src/admin/Makefile.inc.am create mode 100644 src/conf/Makefile.inc.am create mode 100644 src/cpu/Makefile.inc.am create mode 100644 src/interface/Makefile.inc.am create mode 100644 src/locking/Makefile.inc.am create mode 100644 src/logging/Makefile.inc.am create mode 100644 src/network/Makefile.inc.am create mode 100644 src/node_device/Makefile.inc.am create mode 100644 src/nwfilter/Makefile.inc.am create mode 100644 src/remote/Makefile.inc.am create mode 100644 src/rpc/Makefile.inc.am create mode 100644 src/secret/Makefile.inc.am create mode 100644 src/security/Makefile.inc.am create mode 100644 src/storage/Makefile.inc.am create mode 100644 src/util/Makefile.inc.am create mode 100644 src/vmx/Makefile.inc.am -- 2.14.3

2 18

[libvirt] [PATCH v6 00/11] qemu: Validate PCI controller options
by Andrea Bolognani 05 Mar '18

05 Mar '18

Applies cleanly on top of 11819aee65b8ea71860526f529d86ab646b9cd1f. Patches 2/11 and 4/11 are the only ones missing R-bs, everything else hasn't been significantly altered since the previous respin. Changes from [v5]: * patch 1 has been pushed; * add virReportController*() functions to cut down on redundant error reporting, as suggested by laine; * report index and modelName along with model in error messages. Changes from [v4]: * patch 1/12 is new; * use virReportEnumRangeError(), as suggested by laine. Changes from [v3]: * don't introduce new test cases that won't be able to provide full test coverage anyway, as suggested by laine. Changes from [v2]: * replace the old implementation bit by bit using a clever trick suggested by pkrempa; * don't move QEMU capability validation; * add a default: label to all switch statements as recommended by danpb. Changes from [v1]: * error out instead of silently accept invalid options; * shave quite a lot of yaks. [v5] https://www.redhat.com/archives/libvir-list/2018-March/msg00096.html [v4] https://www.redhat.com/archives/libvir-list/2018-February/msg01232.html [v3] https://www.redhat.com/archives/libvir-list/2018-February/msg00996.html [v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00813.html [v1] https://www.redhat.com/archives/libvir-list/2018-February/msg00244.html Andrea Bolognani (11): qemu: Create new qemuDomainDeviceDefValidateControllerPCI() qemu: Validate PCI controller options (modelName) qemu: Validate PCI controller options (index) qemu: Validate PCI controller options (targetIndex) qemu: Validate PCI controller options (pcihole64) qemu: Validate PCI controller options (busNr) qemu: Validate PCI controller options (numaNode) qemu: Validate PCI controller options (chassisNr) qemu: Validate PCI controller options (chassis and port) qemu: Validate PCI controllers (QEMU capabilities) qemu: Remove old qemuDomainDeviceDefValidateControllerPCI() src/qemu/qemu_domain.c | 540 +++++++++++++++++-------- tests/qemuxml2argvdata/pcie-expander-bus.xml | 3 - tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 4 +- 3 files changed, 382 insertions(+), 165 deletions(-) -- 2.14.3

1 11

[libvirt] [PATCH] make sure libvirt is linked first
by Jan Palus 05 Mar '18

05 Mar '18

so it's not affected by flags that might be passed in $(*_LIBS) like -L/usr/lib which might result in linking against system library and requiring incorrect version of private symbols --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3bf2da5..cb6ee84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1456,10 +1456,11 @@ libvirt_driver_nwfilter_impl_la_CFLAGS = \ $(AM_CFLAGS) libvirt_driver_nwfilter_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_nwfilter_impl_la_LIBADD = \ + libvirt.la \ $(LIBPCAP_LIBS) \ $(LIBNL_LIBS) \ - $(DBUS_LIBS) -libvirt_driver_nwfilter_impl_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la + $(DBUS_LIBS) \ + ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_impl_la_SOURCES = $(NWFILTER_DRIVER_SOURCES) endif WITH_NWFILTER -- 2.16.2

3 7

[libvirt] [PATCH python] Post-release version bump to 4.2.0
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial change setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 63da8c5..c40908b 100755 --- a/setup.py +++ b/setup.py @@ -334,7 +334,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '4.1.0', + version = '4.2.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.14.3

1 0

[libvirt] [PATCH] Post-release version bump to 4.2.0
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial fix configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5e720d1b76..970a695ad1 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [4.1.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [4.2.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index e4d61d1d7f..4da692b269 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,6 +33,14 @@ --> <libvirt> + <release version="v4.2.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v4.1.0" date="2018-03-05"> <section title="New features"> <change> -- 2.14.3

1 0

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: libvirt-master-mingw » libvirt-fedora-rawhide #1863
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

On Mon, Mar 05, 2018 at 02:28:37PM +0000, ci(a)centos.org wrote: > See <https://ci.centos.org/job/libvirt-master-mingw/systems=libvirt-fedora-rawhi…> > > Changes: > > [jtomko] conf: set postParseFailed even without ALLOW_POST_PARSE_FAIL > > [berrange] travis: force install of python2 into $PATH on macOS > > ------------------------------------------ > ../../libtool: line 3227: 17288 Segmentation fault (core dumped) $MV "${write_libobj}T" "$write_libobj" > ../../libtool: line 3780: 17291 Segmentation fault (core dumped) $RM $removelist > /bin/sh: line 2: 17297 Segmentation fault (core dumped) mv -f $depbase.Tpo $depbase.Plo > make[3]: *** [Makefile:2392: poll.lo] Error 139 > make[3]: *** Waiting for unfinished jobs.... Ignore this - the build host is in middle of a huge dnf update. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] travis: force install of python2 into $PATH on macOS
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

The homebrew formula's ignored Python PEP-0394 recommendations and changed the plain python binary in /usr/local/bin to point to Python 3 instead of Python 2. Python 2 is not even installed into a location that is in $PATH by default anymore. The homebrew packages print a message to stderr claiming to provide a way to fix this [quote] This formula installs a python2 executable to /usr/local/opt/python@2/bin If you wish to have this formula's python executable in your PATH then add the following to ~/.bash_profile: export PATH="/usr/local/opt/python@2/libexec/bin:$PATH" [/quote] When trying to update $PATH are suggested we find out this message is a lie and /usr/local/opt/python@2 does not even exist, instead Python seems to end up in /usr/local/Cellar/python(a)2/2.7.14_1 Rather than hardcoding this version specific directory in our travis config, we change to run "brew link --force python@2", to make it create symlinks in /usr/local/bin for the python2 binary. The original change triggering this problem was https://github.com/Homebrew/homebrew-core/pull/24604#issue-171653084 There are countless bug reports against homebrew-core that are closed without fixes, so it seems they are determined to ignore the Python PEP 0394 recommendations on this. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 44f680ad07..699e4bf33a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,7 @@ env: - VIR_TEST_DEBUG=1 before_install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl xz; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl xz && brew link --force python@2 ; fi before_script: - ./autogen.sh --prefix=$(pwd)/install-root -- 2.14.3

2 1