- Devel - libvirt List Archives

[libvirt] [PATCH] spec: Use --enable-werror on RHEL
by Jiri Denemark 31 Jul '13

31 Jul '13

As RHEL provides a stable tool chain, we don't have to worry about frequent changes in reported compiler warnings (which prevents us from enabling -Werror unconditionally). --- libvirt.spec.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index e74f774..6d6203b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -352,6 +352,14 @@ %endif +# RHEL releases provide stable tool chains and so it is safe to turn +# compiler warning into errors without being worried about frequent +# changes in reported warnings +%if 0%{?rhel} + %define enable_werror --enable-werror +%endif + + Summary: Library providing a simple virtualization API Name: libvirt Version: @VERSION@ @@ -1386,6 +1394,7 @@ of recent versions of Linux (and other OSes). %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ + %{?enable_werror} \ %{init_scripts} make %{?_smp_mflags} gzip -9 ChangeLog -- 1.8.3.2

2 2

[libvirt] [PATCH] spec: RHEL-7 does not have sanlock on i686
by Jiri Denemark 31 Jul '13

31 Jul '13

--- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6236c08..e74f774 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -245,11 +245,16 @@ %if 0%{?fedora} >= 16 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif -%if 0%{?rhel} >= 6 +%if 0%{?rhel} == 6 %ifarch %{ix86} x86_64 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif %endif +%if 0%{?rhel} >= 7 + %ifarch x86_64 + %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} + %endif +%endif # Enable libssh2 transport for new enough distros %if 0%{?fedora} >= 17 -- 1.8.3.2

2 2

[libvirt] [PATCH] spec: Disable libssh2 support for RHEL
by Jiri Denemark 31 Jul '13

31 Jul '13

From: Peter Krempa <pkrempa(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=905513 Libssh2 isn't reliable enough to support the libvirt transport using it. The problems include mishandling of "known_hosts" files that may confuse users. --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a3a831f..6236c08 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -252,7 +252,7 @@ %endif # Enable libssh2 transport for new enough distros -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 17 %define with_libssh2 0%{!?_without_libssh2:1} %endif -- 1.8.3.2

2 2

[libvirt] [PATCH] tests: Put a mock library at the start of LD_PRELOAD
by Jiri Denemark 31 Jul '13

31 Jul '13

This fixes vircgrouptest when run in a sandbox which already overrides open() and others. --- tests/testutils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/testutils.h b/tests/testutils.h index 27af5da..8583747 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -87,8 +87,9 @@ int virtTestMain(int argc, perror(lib); \ return EXIT_FAILURE; \ } \ - if (virAsprintf(&newenv, "%s%s%s", preload ? preload : "", \ - preload ? ":" : "", lib) < 0) { \ + if (!preload) { \ + newenv = (char *) lib; \ + } else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0) { \ perror("virAsprintf"); \ return EXIT_FAILURE; \ } \ -- 1.8.3.2

2 2

[libvirt] [PATCH] spec: Don't mix commands with macro definitions
by Jiri Denemark 31 Jul '13

31 Jul '13

%build section should first define all required macros and then run commands. Interleaving them makes it harder to spot what commands are run. --- libvirt.spec.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6d6203b..0fdba54 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1333,10 +1333,6 @@ of recent versions of Linux (and other OSes). %define init_scripts --with-init_script=redhat %endif -%if 0%{?enable_autotools} - autoreconf -if -%endif - %if %{with_selinux} %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" @@ -1345,6 +1341,11 @@ of recent versions of Linux (and other OSes). %endif %endif + +%if 0%{?enable_autotools} + autoreconf -if +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ -- 1.8.3.2

2 2

[libvirt] 3rd pass at virt-login-shell for joining an LXC Container
by dwalsh＠redhat.com 31 Jul '13

31 Jul '13

All comments applied except for comments below. Also additional cleanup of error handling. > You'll need to call virGetUserDirectory() before any fork(), since it > calls code which is not async-signal safe. The reason I did this is I needed to call it after the shell setuid, if I call it earlier it sees the UID=0 and gives me /root. I added a new interface char *virGetUserDirectoryByUID(uid_t uid); Since the original interface does not take a UID. > Hmm, looking at this again, I'm wondering you need to fork() > at all. In virsh we do the double-fork dance, because virsh > is an interactive shell & we don't want to affect other parts > of virsh. > This login shell though is different - its only job is to run > inside the namespace. So can't the main process just enter > the namespace directly ? I think you still need to do the second fork to make sure the /bin/sh PID gets put in the container. Otherwise you will have a process running within the container without a local PID. [PATCH] virt-login-shell joins users into lxc container.

4 10

[libvirt] [PATCH] Configuring systemd to restart libvirt on abort
by Mooli Tayer 30 Jul '13

30 Jul '13

----- Original Message ----- > On Mon, Jul 29, 2013 at 05:36:21PM +0300, Mooli Tayer wrote: > > From: Mooli Tayer <mtayer(a)redhat.com> > > > > This will create a respawn behaviour in case libvirt > > process exits due to an uncaught signal not specified > > as a clean exit status. > > see http://www.freedesktop.org/software/systemd/man/systemd.service.html > > --- > > daemon/libvirtd.service.in | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in > > index aa5913b..b3c0849 100644 > > --- a/daemon/libvirtd.service.in > > +++ b/daemon/libvirtd.service.in > > @@ -15,6 +15,7 @@ EnvironmentFile=-/etc/sysconfig/libvirtd > > ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS > > ExecReload=/bin/kill -HUP $MAINPID > > KillMode=process > > +Restart=on-abort > > # Override the maximum number of opened files > > #LimitNOFILE=2048 > > I'm wondering whether 'on-abort' is the best choice or if > 'on-failure' or 'always' are better. The systemd.service > man page says > > [quote] > Takes one of no, on-success, on-failure, > on-abort, or always. If set to no (the > default) the service will not be restarted. If > set to on-success it will be restarted only > when the service process exits cleanly. In > this context, a clean exit means an exit code > of 0, or one of the signals SIGHUP, SIGINT, > SIGTERM, or SIGPIPE, and additionally, exit > statuses and signals specified in > SuccessExitStatus=. If set to on-failure the > service will be restarted when the process > exits with an nonzero exit code, is terminated > by a signal (including on core dump), when an > operation (such as service reload) times out, > and when the configured watchdog timeout is > triggered. If set to on-abort the service will > be restarted only if the service process exits > due to an uncaught signal not specified as a > clean exit status. If set to always the > service will be restarted regardless whether > it exited cleanly or not, got terminated > abnormally by a signal or hit a timeout. > [/quote] > > I tend towards saying 'on-failure' here. I agree. we defiantly want restart in the 'on-failure' cases. > > Daniel > -- > |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| > |: http://libvirt.org -o- http://virt-manager.org :| > |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| > |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

3 3

[libvirt] [PATCH] Support apparmor in RPM spec
by Daniel P. Berrange 30 Jul '13

30 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If libapparmor-devel happens to be installed when building the RPM, it will failed due to unlisted virt-aa-helper in %files. Add support for apparmor in the spec, so that we can explicitly turn it on/off, defaulting to off in all distros. This causes --without-apparmor to be given to configure, preventing the build failures if the user happens to have libapparmor-devel present. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index a3a831f..6212b3c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -100,6 +100,9 @@ %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} +# Just hardcode to off, since few people ever have apparmor RPMs installed +%define with_apparmor 0%{!?_without_apparmor:0} + # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} @@ -472,6 +475,9 @@ BuildRequires: avahi-devel %if %{with_selinux} BuildRequires: libselinux-devel %endif +%if %{with_apparmor} +BuildRequires: libapparmor-devel +%endif %if %{with_network} BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables @@ -1268,6 +1274,10 @@ of recent versions of Linux (and other OSes). %define _without_selinux --without-selinux %endif +%if ! %{with_apparmor} + %define _without_apparmor --without-apparmor +%endif + %if ! %{with_hal} %define _without_hal --without-hal %endif @@ -1367,6 +1377,7 @@ of recent versions of Linux (and other OSes). %{?_without_netcf} \ %{?_without_selinux} \ %{?_with_selinux_mount} \ + %{?_without_apparmor} \ %{?_without_hal} \ %{?_without_udev} \ %{?_without_yajl} \ @@ -1835,6 +1846,11 @@ fi %endif %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper + + %if %{with_apparmor} +%attr(0755, root, root) %{_libexecdir}/virt-aa-helper + %endif + %attr(0755, root, root) %{_sbindir}/libvirtd %attr(0755, root, root) %{_sbindir}/virtlockd -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix minor typos in messages and docs
by Yuri Chornoivan 30 Jul '13

30 Jul '13

2 1

[libvirt] [PATCH] Delete obsolete / unused python test files
by Daniel P. Berrange 30 Jul '13

30 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The python/tests directory contains a number of so called "tests" for the python API. These are all hardcoded to look for Xen and cannot be run in any automated fashion, and no one is ever manually running them. Given that they don't meaningully contribute to the test coverage, delete them. For some reason these tests were also copied into the filesystem as part of 'make install'. The change to the RPM in commit 3347a4203278ec93d7b0ceb88b5ed10e4f14765c caused a build failure, since it removed the code which deleted these installed tests. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- python/Makefile.am | 2 - python/tests/Makefile.am | 52 ----------------- python/tests/basic.py | 31 ---------- python/tests/create.py | 146 ----------------------------------------------- python/tests/error.py | 42 -------------- python/tests/node.py | 34 ----------- python/tests/uuid.py | 41 ------------- 8 files changed, 1 insertion(+), 349 deletions(-) delete mode 100644 python/tests/Makefile.am delete mode 100755 python/tests/basic.py delete mode 100755 python/tests/create.py delete mode 100755 python/tests/error.py delete mode 100755 python/tests/node.py delete mode 100755 python/tests/uuid.py diff --git a/configure.ac b/configure.ac index 35a5d76..084d864 100644 --- a/configure.ac +++ b/configure.ac @@ -2447,7 +2447,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ libvirt.pc libvirt.spec mingw-libvirt.spec \ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ - python/Makefile python/tests/Makefile \ + python/Makefile \ daemon/Makefile \ tools/Makefile \ tests/Makefile \ diff --git a/python/Makefile.am b/python/Makefile.am index 7eb42c6..925e1f4 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -16,8 +16,6 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. -SUBDIRS= . tests - INCLUDES = \ $(PYTHON_INCLUDES) \ -I$(top_builddir)/gnulib/lib \ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am deleted file mode 100644 index 0fd3c78..0000000 --- a/python/tests/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Copyright (C) 2005-2011, 2013 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -EXAMPLE_DIR = $(datadir)/doc/libvirt-python-$(VERSION)/examples - -PYTESTS= \ - basic.py \ - create.py \ - uuid.py \ - error.py \ - node.py - -EXTRA_DIST = $(PYTESTS) - -if WITH_PYTHON -tests: $(PYTESTS) - @echo "## running Python regression tests" - -@(PYTHONPATH="..:../.libs:../src/.libs:$(srcdir)/../src:$$PYTHONPATH";\ - export PYTHONPATH; \ - LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH" ; \ - export LD_LIBRARY_PATH; \ - for test in $(PYTESTS) ; \ - do log=`$(PYTHON) $(srcdir)/$$test` ; \ - if [ "`echo $$log | grep OK`" = "" ] ; then \ - echo "-- $$test" ; echo "$$log" ; fi ; done) -else -tests: -endif - -clean: - rm -f *.pyc core - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR) - -(for test in $(PYTESTS); \ - do $(INSTALL) -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) - -uninstall-local: - for test in $(PYTESTS); do rm -f $(DESTDIR)$(EXAMPLE_DIR)/$$test; done diff --git a/python/tests/basic.py b/python/tests/basic.py deleted file mode 100755 index c6dec81..0000000 --- a/python/tests/basic.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/python -u -import libvirt -import sys -import os - -if not os.access("/proc/xen", os.R_OK): - print 'System is not running a Xen kernel' - sys.exit(1) - -conn = libvirt.openReadOnly(None) -if conn == None: - print 'Failed to open connection to the hypervisor' - sys.exit(1) - -# print conn - -try: - dom0 = conn.lookupByName("Domain-0") -except: - print 'Failed to find the main domain' - sys.exit(1) - -# print dom0 - -print "Domain 0: id %d running %s" % (dom0.ID(), dom0.OSType()) -print dom0.info() -del dom0 -del conn -print "OK" - -sys.exit(0) diff --git a/python/tests/create.py b/python/tests/create.py deleted file mode 100755 index 815ccc4..0000000 --- a/python/tests/create.py +++ /dev/null @@ -1,146 +0,0 @@ -#!/usr/bin/python -u -import libvirt -import sys -import os -import time - -if not os.access("/proc/xen", os.R_OK): - print 'System is not running a Xen kernel' - sys.exit(1) - -# -# Try to provide default OS images paths here, of course non standard -# -osroots = [ - "/u/fc4-2.img", - "/u/fc4.img", - "/xen/fc4.img", -] - -okay = 1 - -osroot = None -for root in osroots: - if os.access(root, os.R_OK): - osroot = root - break - -if osroot == None: - print "Could not find a guest OS root, edit to add the path in osroots" - sys.exit(1) - -kernel=open("/proc/version").read().split() -kernelOv = kernel[2] - -if kernelOv.find('hypervisor'): - kernelU = "/boot/vmlinuz-" + kernelOv.replace('hypervisor', 'guest') - initrdU = "/boot/initrd-" + kernelOv.replace('hypervisor', 'guest') + ".img" -elif kernelOv.find('xen0'): - kernelU = "/boot/vmlinuz-" + kernelOv.replace('xen0', 'xenU') - initrdU = "/boot/initrd-" + kernelOv.replace('xen0', 'xenU') + ".img" - -if not os.access(kernelU, os.R_OK): - print "Did not find the guest kernel %s" % (kernelU) - sys.exit(1) - -kernelU = "<kernel>" + kernelU + "</kernel>" - -if not os.access(initrdU, os.R_OK): - print "Did not find the guest initrd %s" % (initrdU) - initrdU = "" -else: - initrdU = "<initrd>" + initrdU + "</initrd>" - - -conn = libvirt.open(None) -if conn == None: - print 'Failed to open connection to the hypervisor' - sys.exit(1) - -xmldesc="""<domain type='xen'> - <name>test</name> - <os> - <type>linux</type> -""" + kernelU + initrdU + """ - <cmdline> root=/dev/sda1 ro selinux=0 3</cmdline> - </os> - <memory>131072</memory> - <vcpu>1</vcpu> - <devices> - <disk type='file'> - <source file='%s'/> - <target dev='sda1'/> - </disk> - <interface type='bridge'> - <source bridge='xenbr0'/> - <mac address='aa:00:00:00:00:12'/> - <script path='/etc/xen/scripts/vif-bridge'/> - </interface> - </devices> -</domain> -""" % (osroot) - -dom = conn.createLinux(xmldesc, 0) -if dom == None: - print 'Failed to create a test domain' - sys.exit(1) - -# print dom - -print "Domain: id %d running %s" % (dom.ID(), dom.OSType()) - -print "Suspending test domain for 5 seconds" -if dom.suspend() != 0: - print 'Failed to suspend domain test' - dom.destroy() - del dom - del conn - sys.exit(1) - -infos = dom.info() -time.sleep(5) -infos2 = dom.info() -if infos[4] != infos2[4]: - print 'Suspended domain test got CPU cycles' - okay = 0 - -print "resuming test domain for 10 seconds" -if dom.resume() != 0: - print 'Failed to resume domain test' - dom.destroy() - del dom - del conn - sys.exit(1) - -time.sleep(10) -print "shutdown of test domain" - -if dom.shutdown() != 0: - okay = 0 - print 'Failed to shutdown domain test' - -i = 0 -while i < 30: - time.sleep(1) - i = i + 1 - try: - t = dom.info()[4] - except: - okay = 0 - t = -1 - break - - if t == 0: - break - -if t != 0: - print 'Shutdown failed destroying domain test' - okay = 0 - dom.destroy() - -del dom -del conn -if okay == 1: - print "OK" - -sys.exit(0) diff --git a/python/tests/error.py b/python/tests/error.py deleted file mode 100755 index 295f9a7..0000000 --- a/python/tests/error.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/python -u -# -# Tests global error handlers at the python level. -# -import libvirt -import sys -import os - -errno = None - -def handler(ctxt, err): - global errno - - #print "handler(%s, %s)" % (ctxt, err) - errno = err - -libvirt.registerErrorHandler(handler, 'context') - -conn = libvirt.openReadOnly(None) -if conn == None: - print 'Failed to open connection to the hypervisor' - sys.exit(1) - -try: - dom0 = conn.lookupByName("Does_not_exist") - print 'strange found a Does_not_exist domain' - sys.exit(1) -except: - pass - -del conn - -if errno == None: - print 'failed to get an error' -elif errno[0] == libvirt.VIR_ERR_NO_CONNECT or \ - errno[0] == libvirt.VIR_ERR_INVALID_DOMAIN or \ - errno[0] == libvirt.VIR_ERR_GET_FAILED: - print "OK" -else: - print 'got unexpected error:', errno - -sys.exit(0) diff --git a/python/tests/node.py b/python/tests/node.py deleted file mode 100755 index f199fc3..0000000 --- a/python/tests/node.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/python -u -import libvirt -import sys -import os - -if not os.access("/proc/xen", os.R_OK): - print 'System is not running a Xen kernel' - sys.exit(1) - -conn = libvirt.openReadOnly(None) -if conn == None: - print 'Failed to open connection to the hypervisor' - sys.exit(1) - -try: - (model, memory, cpus, mhz, nodes, socket, cores, threads) = conn.getInfo() -except: - print 'Failed to extract the current node information' - sys.exit(1) - -print "Xen running on %d %s processors at %d MHz, %d MBytes of memory" % ( - cpus, model, mhz, memory) - -if cpus > nodes * socket * cores * threads: - print "Erroneous CPU information" - sys.exit(1) - -if cpus < nodes * socket * cores * threads: - print "Strange, running in degrated mode, some CPU are not available" - -del conn -print "OK" - -sys.exit(0) diff --git a/python/tests/uuid.py b/python/tests/uuid.py deleted file mode 100755 index db48e80..0000000 --- a/python/tests/uuid.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python -u -import libvirt -import sys -import os - -if not os.access("/proc/xen", os.R_OK): - print 'System is not running a Xen kernel' - sys.exit(1) - -conn = libvirt.openReadOnly(None) -if conn == None: - print 'Failed to open connection to the hypervisor' - sys.exit(1) - -ids = conn.listDomainsID() -if ids == None or len(ids) == 0: - print 'Failed to list running domains' - sys.exit(1) - -id = ids[-1] - -try: - dom = conn.lookupByID(id) -except: - print 'Failed to find the domain %d' - sys.exit(1) - -name0 = dom.name() -uuid = dom.UUID() -print "Using domain %s" % (name0) -try: - dom2 = conn.lookupByUUID(uuid) -except: - print 'Failed to lookup domain %d based on its UUID' - sys.exit(1) -if dom2.name() != name0: - print 'lookup of %s based on UUID brings a different domain %s' % ( - name0, dom2.name()) - -print "OK" -sys.exit(0) -- 1.8.3.1

3 2