- Devel - libvirt List Archives

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

30 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

[libvirt] Release of libvirt-1.1.1
by Daniel Veillard 30 Jul '13

30 Jul '13

As planned the release is out, tagged in git and available at the usual place: ftp://libvirt.org/libvirt/ This is a rather large release, including around 380 commits (time to take some vacations !) with a large set of bug fixes, including 3 CVE security ones, and large improvements over the code base. The localization got updates for no less then 18 languages too, with 8 of them being nearly 100% complete ! Features: - Adding device removal or deletion events (Jiri Denemark) - Introduce new domain create APIs to pass pre-opened FDs to LXC (Daniel P. Berrange) - Add interface versions for Xen 4.3 (Stefan Bader) - Add new public API virDomainSetMemoryStatsPeriod (John Ferlan) - Various LXC improvements (Daniel P. Berrange and Gao feng) Security: - security: fix deadlock with prefork (Eric Blake) - CVE-2013-4153 qemu: Fix double free of returned JSON array in qemuAgentGetVCPUs() (Peter Krempa) - CVE-2013-4154 qemu: Prevent crash of libvirtd without guest agent configuration (Alex Jia) - CVE-2013-2230 Fix crash when multiple event callbacks were registered (Ján Tomko) Documentation: - formatdomain.html.in: Document implementation limitation of QoS (Michal Privoznik) - formatdomain.html.in: Correctly use <code/> in #elementQoS (Michal Privoznik) - Fix copy-paste-error in virNodeGetMemoryStats (Philipp Hahn) - virsh: Mention --driver in man page for nodedev-detach (Peter Krempa) - maint: tweak use of <a> in HACKING (Eric Blake) - maint: fix typo in qemu error message (Eric Blake) - daemon: Fix command example in libvirtd.sasl (Cole Robinson) - Put virt-sanlock-cleanup into section 8 (Guido Günther) - Document hypervisor drivers that support certain timer models (Peter Krempa) Portability: - build: fix shunloadtest breakage (Eric Blake) - examples: fix mingw build vs. printf (Eric Blake) - build: skip systemd mock on non-Linux (Eric Blake) - Fix dbus message reading code on big endian hosts (Daniel P. Berrange) - build: fix another virdbus issue on mingw (Eric Blake) - build: fix virutil build on mingw (Eric Blake) - build: fix virthread build on mingw (Eric Blake) - build: fix virdbus build on mingw (Eric Blake) - build: fix vircgroup build on mingw (Eric Blake) - Conditionalize build of virCgroupValidateMachineGroup (Daniel P. Berrange) - build: fix VPATH 'make check' (Eric Blake) - cpu: Fix one compile error for PPC. (Li Zhang) - virdbustest: Don't pass number of arguments as long long (Guido Günther) - Fix virCgroupAvailable() w/o HAVE_GETMNTENT_R defined (Roman Bogorodskiy) - Fix link_addr detection (Roman Bogorodskiy) - build: work around broken kernel headers (Eric Blake) - dbus: work with older dbus (Eric Blake) - Use AC_LINK_IFELSE (Guido Günther) - Check for link_addr more thoroughly (Guido Günther) - Fix bridge routines detection on kFreeBSD (Roman Bogorodskiy) - Fix build with clang (Ján Tomko) - build: don't ship access syms files in tarball (Eric Blake) - build: work around mingw header pollution (Eric Blake) - build: avoid build failure without gnutls (Eric Blake) Bug Fixes: - Fix probing of legacy Xen driver to not leave URI set (Daniel P. Berrange) - caps: use -device for primary video when qemu >=1.6 (Guannan Ren) - Resolve Coverity complaint in storagevolxml2argvtest (Ján Tomko) - Don't check validity of missing attributes in DNS SRV XML (Ján Tomko) - Set the number of elements 0 in virNetwork*Clear (Ján Tomko) - conf:Fix a copy paste error (Alex Jia) - virLXCMonitorClose: Unlock domain while closing monitor (Michal Privoznik) - libxl: Correctly initialize vcpu bitmap (Stefan Bader) - Add new virAuth symbols to private.syms (Ján Tomko) - Use qemuOpenFile in qemu_driver.c (Martin Kletzander) - Make qemuOpenFile aware of per-VM DAC seclabel. (Martin Kletzander) - domain_event: Resolve memory leak found by Valgrind (John Ferlan) - lxc: Resolve Coverity warning (John Ferlan) - qemu: Take error path if acquiring of job fails in qemuDomainSaveInternal (Peter Krempa) - build: fix make rpm failure (Laine Stump) - virsh: fix change-media bug on disk block type (Guannan Ren) - tests: Free test at the end of GetDeviceAliases JSON test (Jiri Denemark) - vmware: Fix bogus CPU arch copy (Jiri Denemark) - qemu: Shorten SCSI hostdev alias to avoid QEMU failure (Viktor Mihajlovski) - Add virtio-scsi to fallback models of scsi controller (Martin Kletzander) - qemuhotplugtest: Resolve some memleaks (Michal Privoznik) - qemuDomainDetachChrDevice: Don't leak @charAlias (Michal Privoznik) - Fix impl of virDomainCreateWithFlags remote client helper (Daniel P. Berrange) - cgroup: reuse buffer for getline (Ján Tomko) - Create directory for lease files if it's missing (Guido Günther) - rbd: Do not free the secret if it is not set (Wido den Hollander) - Make logical pools independent on target path (Martin Kletzander) - qemu: add macvlan delete to qemuDomainAttachNetDevice cleanup (Matthew Rosato) - qemuBuildChrDeviceCommandLine: Don't leak devstr (Michal Privoznik) - conf: reject pci-root controllers with non-zero indexes (Ján Tomko) - nodeinfo: Don't fail on non-contiguous NUMA topologies (hejia hejia) - util: make virSetUIDGID async-signal-safe (Eric Blake) - qemu_hostdev: Resolve Coverity issue (John Ferlan) - storage_backend: Resolve Coverity issue (John Ferlan) - virsh-nodedev: Resolve Coverity issues (John Ferlan) - virsh-interface: Resolve Coverity issues (John Ferlan) - virsh-domain-monitor: Resolve Coverity issues (John Ferlan) - testutils: Resolve Coverity issues (John Ferlan) - hellolibvirt: Resolve Coverity issues (John Ferlan) - storage: return -1 when fs pool can't be mounted (Ján Tomko) - qemu: fix double free in qemuMigrationPrepareDirect (Ján Tomko) - Properly detect VMDK with internal version 2 (Martin Kletzander) - Resolve Coverity complaints in tests/securityselinuxlabeltest.c (John Ferlan) - Paused domain should remain paused after migration (Jiri Denemark) - conf: don't check hyperv spinlock retries if disabled (Ján Tomko) - Fix NULL dereference caused by ACL filtering of domains (Jiri Denemark) - Unlock the storage volume object after looking it up (Ján Tomko) - libxl: fix deadlock in libxlReconnectDomain (Marek Marczykowski-Górecki) - LXC: fix memory leak when userns configuration is incorrect (Gao feng) - virNetDevBandwidthUnplug: Don't leak @cmd (Michal Privoznik) - virCgroupNewPartition: Don't leak @newpath (Michal Privoznik) - qemuNodeDeviceDetachFlags: Avoid use of uninitialized variables (Michal Privoznik) - qemu: fix return value of qemuDomainBlockPivot on errors (Ján Tomko) Improvements: - tests: consistently use virFilePrintf (Eric Blake) - Rename VIR_DOMAIN_PAUSED_GUEST_PANICKED to VIR_DOMAIN_PAUSED_CRASHED (Daniel P. Berrange) - Remove VIR_DOMAIN_SHUTDOWN_CRASHED from public API (Daniel P. Berrange) - spec: Cat test-suite.log if make check fails (Jiri Denemark) - build: avoid uninitialized use warning (Eric Blake) - Set default partition in libvirtd instead of libvirt_lxc (Daniel P. Berrange) - virStateDriver - Separate AutoStart from Initialize (John Ferlan) - Separate out StateAutoStart from StateInitialize (John Ferlan) - Remove redundant free in virNetworkDNSHostDefParseXML (Ján Tomko) - Remove double space in error messages (Ján Tomko) - Fix virsh snapshot-list error reporting (Jim Fehlig) - Skip detecting placement if controller is disabled (Daniel P. Berrange) - Add 'controllers' arg to virCgroupNewDetect (Daniel P. Berrange) - Fix detection of 'emulator' cgroup (Daniel P. Berrange) - Make virCgroupIsValidMachine static (Daniel P. Berrange) - Introduce a more convenient virCgroupNewDetectMachine (Daniel P. Berrange) - Add inputpool to storagevolxml2argvtest (Ján Tomko) - Move volume XMLs out of storagevolxml2argvdata (Ján Tomko) - Move pool XML out of storagevolxml2argvdata (Ján Tomko) - Use separate macros for failure/success in vol-to-argv test (Ján Tomko) - tests: PCI controller checks (Ján Tomko) - Don't overwrite errors in qemuTranslateDiskSourcePool (Ján Tomko) - Protection against doing bad stuff to the root group (Daniel P. Berrange) - Convert LXC driver to use virCgroupNewMachine (Daniel P. Berrange) - Convert QEMU driver to use virCgroupNewMachine (Daniel P. Berrange) - New cgroups API for atomically creating machine cgroups (Daniel P. Berrange) - Add a colon after 'internal error' (Ján Tomko) - Expose ownership ID parsing (Martin Kletzander) - qemu: set/validate slot/connection type when assigning slots for PCI devices (Laine Stump) - qemu: make QEMU_PCI_ADDRESS_(SLOT|FUNCTION)_LAST less misleading (Laine Stump) - qemu: only check for PIIX3-specific device addrs on pc-* machinetypes (Laine Stump) - qemu: turn qemuDomainPCIAddressBus into a struct (Laine Stump) - valgrind.supp: Add more valgrind suppression paths (John Ferlan) - Create + setup cgroups atomically for LXC process (Daniel P. Berrange) - Create + setup cgroups atomically for QEMU process (Daniel P. Berrange) - Remove obsolete cgroups creation apis (Daniel P. Berrange) - Auto-detect existing cgroup placement (Daniel P. Berrange) - Add API for checking if a cgroup is valid for a domain (Daniel P. Berrange) - Add a virCgroupNewDetect API for finding cgroup placement (Daniel P. Berrange) - Add logic for handling systemd-machined non-existance (Daniel P. Berrange) - Fix handling of DBus errors emitted by the bus itself (Daniel P. Berrange) - storage: Add connection for autostart storage pool (John Ferlan) - Adjust 'ceph' authentication secret usage for rbd pool. (John Ferlan) - storage: Support "chap" authentication for iscsi pool (John Ferlan) - qemu_common: Create qemuBuildVolumeString() to process storage pool (John Ferlan) - qemu: Create a common qemuGetSecretString (John Ferlan) - qemu: Add source pool auth info to virDomainDiskDef for iSCSI (John Ferlan) - bridge driver: use more general function names (Roman Bogorodskiy) - Add virDBusMessage(Encode,Decode) stubs (Roman Bogorodskiy) - qemu: Translate the volume type disk source before cgroup setting (Osier Yang) - conf: Ignore the volume type disk if its mode is "direct" (Osier Yang) - qemu: Translate the iscsi pool/volume disk source (John Ferlan) - conf: Introduce virDomainDiskSourceIsBlockType (John Ferlan) - conf: Introduce new XML tag "mode" for disk source (John Ferlan) - storage_iscsi: Reflect the default target port (John Ferlan) - bridge driver: s/network_driver/virNetworkDriverState/ (Roman Bogorodskiy) - Convert remainder of cgroups code to report errors (Daniel P. Berrange) - Convert the virCgroupKill* APIs to report errors (Daniel P. Berrange) - Report full errors from virCgroupNew* (Daniel P. Berrange) - Add helpers for dealing with system errors (Daniel P. Berrange) - Add API for calling systemd-machined's DBus API (Daniel P. Berrange) - Introduce virDBusCallMethod & virDBusMessageRead methods (Daniel P. Berrange) - cpu: Let explicit features override model features (Jiri Denemark) - cpu: Store arch in virCPUData (Jiri Denemark) - Replace union cpuData with virCPUData (Jiri Denemark) - cpu_x86: Use x86-specific CPU data structure (Jiri Denemark) - LXC: Set default driver for image backed filesystems (Daniel P. Berrange) - LXC: Fix some error reporting in filesystem setup (Daniel P. Berrange) - qemu: Unplug devices that disappeared when libvirtd was down (Jiri Denemark) - qemu: Introduce qemuMonitorGetDeviceAliases (Jiri Denemark) - conf: Make error reporting in virDomainDefFindDevice optional (Jiri Denemark) - util: Non-existent string array does not contain any string (Jiri Denemark) - Change s/i/iv/ in test code to avoid syntax-check (Daniel P. Berrange) - Allow test cases to be run selectively (Daniel P. Berrange) - maint: update to latest gnulib (Eric Blake) - autogen: Handle case when libvirt's submodule (Michal Privoznik) - security_dac: compute supplemental groups before fork (Eric Blake) - security: framework for driver PreFork handler (Eric Blake) - qemu: Emit VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED events (Jiri Denemark) - qemu: Remove devices only after DEVICE_DELETED event (Jiri Denemark) - qemu: Add support for DEVICE_DELETED event (Jiri Denemark) - Add virDomainDefFindDevice for looking up a device by its alias (Jiri Denemark) - Clarify virDomainDetachDeviceFlags documentation (Jiri Denemark) - examples: Handle VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED event (Jiri Denemark) - Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED event (Jiri Denemark) - qemu: Separate char device removal into a standalone function (Jiri Denemark) - qemu: Set cpuset.cpus for domain process (Osier Yang) - caps: Add helpers to convert NUMA nodes to corresponding CPUs (Peter Krempa) - Introduce lxcDomObjFromDomain (Michal Privoznik) - Remove lxcDriverLock from almost everywhere (Michal Privoznik) - lxc: Make activeUsbHostdevs use locks (Michal Privoznik) - Stop accessing driver->caps directly in LXC driver (Michal Privoznik) - lxc: switch to virCloseCallbacks API (Michal Privoznik) - Introduce annotations for virLXCDriverPtr fields (Michal Privoznik) - lxc: Use atomic ops for driver->nactive (Michal Privoznik) - Introduce a virLXCDriverConfigPtr object (Michal Privoznik) - virLXCDriver: Drop unused @cgroup (Michal Privoznik) - qemu: Move close callbacks handling into util/virclosecallbacks.c (Michal Privoznik) - virAsprintf: correctly check return value (Ján Tomko) - Merge virCommandPreserveFD / virCommandTransferFD (Daniel P. Berrange) - Enable FD passing when starting guests with virsh (Daniel P. Berrange) - LXC: Wire up the virDomainCreate{XML}WithFiles methods (Daniel P. Berrange) - Introduce remote protocol support for virDomainCreate{XML}WithFiles (Daniel P. Berrange) - maint: Make ctags work out of the box (Jiri Denemark) - esx: Support for disk-only and quiescing snapshots. (Geoff Hickey) - libxl: implement virDomainGetNumaParameters (Dario Faggioli) - libxl: advertise the support for VIR_TYPED_PARAM_STRING (Dario Faggioli) - lxc_container: Don't call virGetGroupList during exec (Michal Privoznik) - qemuDomainGetSchedulerType: Prefer qemuDomObjFromDomain (Michal Privoznik) - virSecurityManagerGenLabel: Skip seclabels without model (Michal Privoznik) - lxcCapsInit: Allocate primary security driver unconditionally (Michal Privoznik) - qemu: Separate host device removal into a standalone function (Jiri Denemark) - qemu: Separate net device removal into a standalone function (Jiri Denemark) - qemu: Separate controller removal into a standalone function (Jiri Denemark) - qemu: Separate disk device removal into a standalone function (Jiri Denemark) - qemu: Add qemuDomainReleaseDeviceAddress to remove any address (Jiri Denemark) - build: avoid compiler warning on shadowed name (Eric Blake) - LXC: Change the owner of live attached host devices (Gao feng) - LXC: Change the owner of host devices to the root of container (Gao feng) - LXC: Create host devices for container on host side (Gao feng) - LXC: Change the owner of live attached disk device (Gao feng) - LXC: Move virLXCControllerChown to lxc_container.c (Gao feng) - LXC: controller: change the owner of disk to the root of container (Gao feng) - LXC: Setup disks for container on host side (Gao feng) - Allow balloon driver collection to be adjusted dynamically (John Ferlan) - Implement the virDomainSetMemoryStatsPeriod for QEMU driver (John Ferlan) - Specify remote protocol for virDomainSetMemoryStatsPeriod (John Ferlan) - Add capability to fetch balloon stats (John Ferlan) - Determine whether to start balloon memory stats gathering. (John Ferlan) - Add 'period' for Memballoon statistics gathering capability (John Ferlan) - qemuhotplugtest: Introduce test for chardev hotplug (Michal Privoznik) - qemu: Implement chardev hotplug on live level (Michal Privoznik) - qemu: Implement chardev hotplug on config level (Michal Privoznik) - domain_conf: Auto fill chardev port (Michal Privoznik) - cpu: Allow fine tuning of "host-model" cpu (Peter Krempa) - cpu: Clean up code style (Peter Krempa) - cpu: Add virCPUDefUpdateFeature() (Peter Krempa) - conf: Clean up error reporting in cpu definition parsing (Peter Krempa) - storage_conf: Merge AuthChap and AuthCephx into AuthSecret (John Ferlan) - storage_conf: Move username processing into common function (John Ferlan) - storage_pool: Rework chap XML to mimic ceph (John Ferlan) - storage_conf: Move auth processing into virStoragePoolDefParseAuth (John Ferlan) - storage_conf: Introduce virStoragePoolAuthSecretPtr (John Ferlan) - storage_conf: Adjust virStoragePoolAuthType enum (John Ferlan) - Add qemuMonitorJSONSetObjectProperty() method for QMP qom-set command (John Ferlan) - Add qemuMonitorJSONGetObjectProperty() method for QMP qom-get command (John Ferlan) - Add qemuMonitorJSONGetObjectListPaths() method for QMP qom-list command (John Ferlan) - pci: make virPCIDeviceReset more autonomous (Laine Stump) - pci: reorder static functions (Laine Stump) - python: return dictionary without value in case of no blockjob (Guannan Ren) - Change domain controller index type to unsigned (Jincheng Miao) - Add a couple of debug statements to LXC driver (Daniel P. Berrange) - qemu: Introduce qemuBuildChrDeviceStr (Michal Privoznik) - qemu_command: Honour chardev alias assignment with a function (Michal Privoznik) - qemu_monitor: Introduce qemuMonitorDetachCharDev (Michal Privoznik) - qemu_monitor: Introduce qemuMonitorAttachCharDev (Michal Privoznik) - qemu_monitor_json: Move InetSocketAddress build to a separate function (Michal Privoznik) - domain_conf: Introduce chardev hotplug helpers (Michal Privoznik) - remote: Improve libssh2 password authentication (Peter Krempa) - libssh2: Improve password based authentication (Peter Krempa) - virAuth: Don't require virConnectPtr to retrieve authentication creds (Peter Krempa) - util: add virGetGroupList (Eric Blake) - util: improve user lookup helper (Eric Blake) - maint: update to latest gnulib (Eric Blake) - qemu: Fix hot (un-)plug error codes and messages (Michal Privoznik) - conf: Rework virDomainDeviceDefParse (Michal Privoznik) - conf: Extend device types handled by virDomainDeviceDefParse (Michal Privoznik) - LXC: remove some incorrect setting ATTRIBUTE_UNUSED (Gao feng) - qemu: Slightly increase memory limit (Jiri Denemark) - util: add rebase fix that was accidentally omitted from previous patch (Laine Stump) - util: use VIR_(APPEND|DELETE)_ELEMENT for pci/usb device lists (Laine Stump) - Prevent use of 'int' data type & 'ii', 'jj', 'kk' var names for loops (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in examples/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in python/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/cpu/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/hyperv/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/interface/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/network/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/libxl/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/locking/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/lxc/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/node_device/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/nwfilter/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/openvz/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/parallels/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/phyp/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/qemu files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/remote/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/rpc/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/secret/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/security files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/test/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/uml/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/vbox/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/storage/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/{esx,vmx,vmware} files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/{xen,xenapi,xenxs} files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in tools/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in tests/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/util/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in src/conf/ files (Daniel P. Berrange) - Convert 'int i' to 'size_t i' in daemon/ files (Daniel P. Berrange) - Adapt to VIR_ALLOC and virAsprintf in tools/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in tests/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/xenxs/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/xenapi/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/xen/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/vmx/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/vmware/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/vbox/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/util/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/uml/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/test/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/storage/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/security/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/secret/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/rpc/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/remote/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/qemu/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/phyp/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/parallels/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/openvz/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/nwfilter/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/network/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/node_device/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/lxc/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/locking/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/libxl/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/interface/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/hyperv/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/esx/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/cpu/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/conf/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in src/access/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in daemon/* (Michal Privoznik) - Adapt to VIR_ALLOC and virAsprintf in docs/ (Michal Privoznik) - Introduce OOM reporting to virAsprintf (Michal Privoznik) - viralloc: Report OOM error on failure (Michal Privoznik) - build: honor autogen.sh --no-git (Eric Blake) - LXC: hostdev: create parent directory for hostdev (Gao feng) - LXC: hostdev: introduce lxcContainerSetupHostdevCapsMakePath (Gao feng) - LXC: Create /dev/tty within a container (Richard Weinberger) - scsi: Fix construction of sysfs device path (Viktor Mihajlovski) - selinux: Always generate imagelabel (Peter Krempa) - selinux: Cleanup coding style (Peter Krempa) - qemu: Set RLIMIT_MEMLOCK when memoryBacking/locked is used (Jiri Denemark) - qemu: Use qemuDomainMemoryLimit when computing memory for VFIO (Jiri Denemark) - qemu: Move memory limit computation to a reusable function (Jiri Denemark) - Don't spam logs with "port 0 must be in range" errors (Jiri Denemark) - qemu: Release correct websocket port (Jiri Denemark) - conf: virDomainObjListRemoveLocked function (Marek Marczykowski-Górecki) - maint: update to latest gnulib (Eric Blake) - Extend the ACL test case to validate filter rule checks (Daniel P. Berrange) - Add access control filtering of interface objects (Daniel P. Berrange) - Add access control filtering of nwfilter objects (Daniel P. Berrange) - Add access control filtering of secret objects (Daniel P. Berrange) - Add access control filtering of storage objects (Daniel P. Berrange) - Add access control filtering of node device objects (Daniel P. Berrange) - Add access control filtering of network objects (Daniel P. Berrange) - Change signature of ACL filter functions (Daniel P. Berrange) - Add access control filtering of domain objects (Daniel P. Berrange) - qemu: Allow seamless migration for domains with multiple graphics (Martin Kletzander) - qemu: Don't miss errors when changing graphics passwords (Martin Kletzander) - LXC: blkio: allow to setup weight_device (Gao feng) - qemu: Implement 'oncrash' coredump events when guest panicked (Chen Fan) - qemu: Implement 'oncrash' events when guest panicked (Chen Fan) - qemu: expose qemuProcessShutdownOrReboot() (Chen Fan) - qemu: refactor processWatchdogEvent (Chen Fan) - libvirt: Define domain crash event types (Chen Fan) - Add some misc debugging to LXC startup (Daniel P. Berrange) - Ignore failure to mount SELinux filesystem in container (Daniel P. Berrange) - LXC: fuse: Change files owner to the root user of container (Gao feng) - LXC: controller: change the owner of /dev/pts and ptmx to the root of container (Gao feng) - LXC: controller: change the owner of devices created on host (Gao feng) - LXC: controller: change the owner of /dev to the root user of container (Gao feng) - LXC: controller: change the owner of tty devices to the root user of container (Gao feng) - LXC: Creating devices for container on host side (Gao feng) - LXC: introduce virLXCControllerSetupUserns and lxcContainerSetID (Gao feng) - LXC: sort the uidmap/gidmap of domain (Gao feng) - LXC: enable user namespace only when user set the uidmap (Gao feng) - LXC: Introduce New XML element for user namespace (Gao feng) - qemu: Improve info message and remove a variable in qemuDomainManagedSave (Peter Krempa) - libxl: implement per NUMA node free memory reporting (Dario Faggioli) - build: configure must not affect tarball contents (Eric Blake) - Drop iptablesContext (Roman Bogorodskiy) - qemu: indentation fix (Ján Tomko) - qemu: Implement CPUs check against machine type's cpu-max (Michal Novotny) Cleanups: - python: Drop TODO (Cole Robinson) - maint: split long lines in Makefiles (Eric Blake) - tests: split long lines (Eric Blake) - qemu: Cleanup coding style nits in qemu_cgroup.c (Peter Krempa) So thanks everybody for the contributions to this large release, be it with bug reports code, ideas, documentation or localizations ! Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [v1.0.5-maint PATCH] lxc: correctly backport /dev/tty fix
by Eric Blake 30 Jul '13

30 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=982317 maint-only patch; reported by Geert Jansen Commit 17cdc298 tried to backport upstream 90a0c6d, but in resolving conflicts, failed to account that upstream commit e1d32bb refactored code to leave off a leading /dev. * src/lxc/lxc_container.c (lxcContainerPopulateDevices): Use correct device name. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8497c10..972486b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -839,7 +839,7 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_FULL, 0666, "/dev/full" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM, 0666, "/dev/random" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM, 0666, "/dev/urandom" }, - { LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY, 0666, "/tty" }, + { LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY, 0666, "/dev/tty" }, }; const struct { const char *src; -- 1.8.3.1

2 2

[libvirt] Linking fails on FreeBSD
by Roman Bogorodskiy 30 Jul '13

30 Jul '13

Hi, Linking fails on FreeBSD: CCLD libvirt.la /usr/bin/ld: ./.libs/libvirt_util.a(libvirt_util_la-vircgroup.o): relocation R_X86_64_PC32 against `virCgroupPartitionEscape' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: Bad value Following the suggestion and re-compiling with -fPIC doesn't help. Anybody has an idea how to fix that? Roman Bogorodskiy

5 21

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 1.1.0
by Daniel P. Berrange 30 Jul '13

30 Jul '13

I am pleased to announce that release 1.1.0 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.1.0.tar.gz Changed in this release: - Add support for v3 of migration APIs - Add all new constants in libvirt 1.1.0 - Fix handling of sparse typed parameters - Fix misc typos in docs Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, 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 :|

1 0

[libvirt] [PATCH v2] Fix dbus message reading code on big endian hosts
by Daniel P. Berrange 30 Jul '13

30 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The way we were casting small (<32bit) integers was broken on big endian hosts, causing stack smashing. This was detected in the test suite either by test failures due to incorrect results, or by libc/gcc abort'ing with its stack canary triggered. In v2: - Added missing change to virdbus.c Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virdbus.c | 6 +++--- tests/virdbustest.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 4ce6c46..33f3379 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -738,7 +738,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, switch (*t) { case DBUS_TYPE_BYTE: - GET_NEXT_VAL(unsigned char, int, "%d"); + GET_NEXT_VAL(unsigned char, unsigned char, "%d"); break; case DBUS_TYPE_BOOLEAN: @@ -746,11 +746,11 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, break; case DBUS_TYPE_INT16: - GET_NEXT_VAL(dbus_int16_t, int, "%d"); + GET_NEXT_VAL(dbus_int16_t, short, "%d"); break; case DBUS_TYPE_UINT16: - GET_NEXT_VAL(dbus_uint16_t, unsigned int, "%d"); + GET_NEXT_VAL(dbus_uint16_t, short unsigned, "%d"); break; case DBUS_TYPE_INT32: diff --git a/tests/virdbustest.c b/tests/virdbustest.c index fb241ee..61de937 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -54,8 +54,8 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) int ret = -1; unsigned char in_byte = 200, out_byte = 0; int in_bool = true, out_bool = false; - int in_int16 = 12000, out_int16 = 0; - unsigned int in_uint16 = 32000, out_uint16 = 0; + short in_int16 = 0xfefe, out_int16 = 0; + unsigned short in_uint16 = 32000, out_uint16 = 0; int in_int32 = 100000000, out_int32 = 0; unsigned int in_uint32 = 200000000, out_uint32 = 0; long long in_int64 = 1000000000000, out_int64 = 0; @@ -232,8 +232,8 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) int ret = -1; unsigned char in_byte = 200, out_byte = 0; int in_bool = true, out_bool = false; - int in_int16 = 12000, out_int16 = 0; - unsigned int in_uint16 = 32000, out_uint16 = 0; + short in_int16 = 12000, out_int16 = 0; + unsigned short in_uint16 = 32000, out_uint16 = 0; int in_int32 = 100000000, out_int32 = 0; unsigned int in_uint32 = 200000000, out_uint32 = 0; long long in_int64 = 1000000000000, out_int64 = 0; -- 1.8.1.4

3 4

[libvirt] [PATCH] Fix dbus message reading code on big endian hosts
by Daniel P. Berrange 30 Jul '13

30 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The way we were casting small (<32bit) integers was broken on big endian hosts, causing stack smashing. This was detected in the test suite either by test failures due to incorrect results, or by libc/gcc abort'ing with its stack canary triggered. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virdbustest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/virdbustest.c b/tests/virdbustest.c index fb241ee..61de937 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -54,8 +54,8 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) int ret = -1; unsigned char in_byte = 200, out_byte = 0; int in_bool = true, out_bool = false; - int in_int16 = 12000, out_int16 = 0; - unsigned int in_uint16 = 32000, out_uint16 = 0; + short in_int16 = 0xfefe, out_int16 = 0; + unsigned short in_uint16 = 32000, out_uint16 = 0; int in_int32 = 100000000, out_int32 = 0; unsigned int in_uint32 = 200000000, out_uint32 = 0; long long in_int64 = 1000000000000, out_int64 = 0; @@ -232,8 +232,8 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) int ret = -1; unsigned char in_byte = 200, out_byte = 0; int in_bool = true, out_bool = false; - int in_int16 = 12000, out_int16 = 0; - unsigned int in_uint16 = 32000, out_uint16 = 0; + short in_int16 = 12000, out_int16 = 0; + unsigned short in_uint16 = 32000, out_uint16 = 0; int in_int32 = 100000000, out_int32 = 0; unsigned int in_uint32 = 200000000, out_uint32 = 0; long long in_int64 = 1000000000000, out_int64 = 0; -- 1.8.1.4

1 1

[libvirt] [PATCH] spec: Cat test-suite.log if make check fails
by Jiri Denemark 30 Jul '13

30 Jul '13

Current automake enables parallel test by default, which means test details are only logged in test-suite.log and not printed to stderr. This patch makes test failures directly visible in RPM build logs even when parallel tests are turned on. --- libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 81101e8..a3a831f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1482,7 +1482,11 @@ do printf '#!/bin/sh\nexit 0\n' > $i chmod +x $i done -make check +if ! make check VIR_TEST_DEBUG=1 +then + cat test-suite.log || true + exit 1 +fi %if %{with_libvirtd} %pre daemon -- 1.8.3.2

2 2

[libvirt] [PATCHv2] build: avoid -lgcrypt with newer gnutls
by Eric Blake 29 Jul '13

29 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=951637 Newer gnutls uses nettle, rather than gcrypt, which is a lot nicer regarding initialization. Yet we were unconditionally initializing gcrypt even when gnutls wouldn't be using it, and having two crypto libraries linked into libvirt.so is pointless. Assume that the switch to gnutls 3.0 is a reliable witness, when pkg-config is present; otherwise be pessimistic and use gcrypt. * configure.ac (WITH_GNUTLS): Probe whether to add -lgcrypt, and define a witness WITH_GNUTLS_GCRYPT. * src/libvirt.c (virTLSMutexInit, virTLSMutexDestroy) (virTLSMutexLock, virTLSMutexUnlock, virTLSThreadImpl) (virGlobalInit): Honor the witness. * libvirt.spec.in (BuildRequires): Make gcrypt usage conditional, no longer needed in Fedora 19. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: use second pkg-config invocation rather than ldd to determine whether gnutls uses gcrypt configure.ac | 27 +++++++++++++++++++-------- libvirt.spec.in | 2 ++ src/libvirt.c | 10 ++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index cc9942a..eb56b63 100644 --- a/configure.ac +++ b/configure.ac @@ -1076,12 +1076,19 @@ if test "x$with_gnutls" != "xno"; then LIBS="$LIBS $GNUTLS_LIBS" GNUTLS_FOUND=no + GNUTLS_GCRYPT=no if test -x "$PKG_CONFIG" ; then + dnl double probe, since we know that gnutls 3.0 switched to nettle instead of + dnl gcrypt PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, - [GNUTLS_FOUND=yes], [GNUTLS_FOUND=no]) + [GNUTLS_FOUND=yes + PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.0], [], [GNUTLS_GCRYPT=yes])], + [GNUTLS_FOUND=no]) fi if test "$GNUTLS_FOUND" = "no"; then + dnl pkg-config couldn't help us, assume gcrypt is necessary fail=0 + GNUTLS_GCRYPT=yes AC_CHECK_HEADER([gnutls/gnutls.h], [], [fail=1]) AC_CHECK_LIB([gnutls], [gnutls_handshake],[], [fail=1], [-lgcrypt]) @@ -1098,13 +1105,17 @@ if test "x$with_gnutls" != "xno"; then AC_MSG_ERROR([You must install the GnuTLS library in order to compile and run libvirt]) fi else - dnl Not all versions of gnutls include -lgcrypt, and so we add - dnl it explicitly for the calls to gcry_control/check_version - GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" - - dnl We're not using gcrypt deprecated features so define - dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings - GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED" + dnl If gnutls linked against -lgcrypt, then we must initialize gcrypt + dnl prior to using gnutls. Newer versions of gnutls use -lnettle, in + dnl which case we don't want to drag in gcrypt ourselves. + if test "$GNUTLS_GCRYPT" = yes; then + GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" + dnl We're not using gcrypt deprecated features so define + dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings + GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED" + AC_DEFINE_UNQUOTED([WITH_GNUTLS_GCRYPT], 1, + [set to 1 if it is known or assumed that GNUTLS uses gcrypt]) + fi dnl gnutls 3.x moved some declarations to a new header AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[ diff --git a/libvirt.spec.in b/libvirt.spec.in index e0e0004..4320281 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -422,7 +422,9 @@ BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: libtasn1-devel +%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 19) BuildRequires: libgcrypt-devel +%endif BuildRequires: gnutls-devel BuildRequires: libattr-devel %if %{with_libvirtd} diff --git a/src/libvirt.c b/src/libvirt.c index 8157488..66e8248 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -55,7 +55,9 @@ #include "intprops.h" #include "virconf.h" #if WITH_GNUTLS -# include <gcrypt.h> +# if WITH_GNUTLS_GCRYPT +# include <gcrypt.h> +# endif # include "rpc/virnettlscontext.h" #endif #include "vircommand.h" @@ -270,7 +272,7 @@ winsock_init(void) #endif -#ifdef WITH_GNUTLS +#ifdef WITH_GNUTLS_GCRYPT static int virTLSMutexInit(void **priv) { virMutexPtr lock = NULL; @@ -323,7 +325,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { virTLSMutexUnlock, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -#endif +#endif /* WITH_GNUTLS_GCRYPT */ /* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but @@ -407,7 +409,7 @@ virGlobalInit(void) virErrorInitialize() < 0) goto error; -#ifdef WITH_GNUTLS +#ifdef WITH_GNUTLS_GCRYPT /* * This sequence of API calls it copied exactly from * gnutls 2.12.23 source lib/gcrypt/init.c, with -- 1.8.3.1

3 6

[libvirt] [PATCH 1/1] cpu: Fix one compile error for PPC.
by Li Zhang 29 Jul '13

29 Jul '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> CPU data structure is refined, which causes one compile error for PPC. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 62437d3..55a4153 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -354,15 +354,15 @@ ppcDataFree(virCPUDataPtr data) static virCPUDataPtr ppcNodeData(void) { - virCPUDataPtr data; + virCPUDataPtr cpuData; - if (VIR_ALLOC(data) < 0) + if (VIR_ALLOC(cpuData) < 0) return NULL; asm("mfpvr %0" - : "=r" (data->ppc.pvr)); + : "=r" (cpuData->data.ppc.pvr)); - return data; + return cpuData; } #endif -- 1.8.1.4

3 5

[libvirt] Use flock() instead of fcntl()
by David Weber 29 Jul '13

29 Jul '13

Hi, we are interested in using virtlockd on an OCFS2 shared filesystem. We are now facing the problem that virtlockd uses fcntl() locks which aren't supported by OCFS2 with the o2cb cluster stack and we want to avoid using indirect leases. OCFS2 instead supports flock() which is quite similar to fcntl(). I attached a patch which makes libvirt use flock() *instead* of fcntl() and it seems to work. NFS on the contrast only supports fcntl() so it should be configurable which lock type to use. I'm not very experienced with locking, so would such a patch be acceptable or do you see possible problems with it? Cheers, David >From b823a9a9bd60a870d64341c4273c42d4eeba8d9b Mon Sep 17 00:00:00 2001 From: David Weber <wb(a)munzinger.de> Date: Thu, 25 Jul 2013 08:20:20 +0000 Subject: [PATCH] Use flock() instead of fcntl() --- src/util/virfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 8f0eec3..e243c26 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c int virFileLock(int fd, bool shared, off_t start, off_t len) .l_len = len, }; - if (fcntl(fd, F_SETLK, &fl) < 0) + if (flock(fd, LOCK_EX | LOCK_NB) < 0) return -errno; return 0; int virFileUnlock(int fd, off_t start, off_t len) .l_len = len, }; - if (fcntl(fd, F_SETLK, &fl) < 0) + if (flock(fd, LOCK_UN) < 0) return -errno; return 0; -- 1.8.1.5

3 10

[libvirt] [PATCH] build: fix VPATH 'make check'
by Eric Blake 29 Jul '13

29 Jul '13

A VPATH build 'make check' was failing with: GEN check-driverimpls Can't open ../../src/../../src/lxc/lxc_monitor_protocol.h: No such file or directory at ../../src/check-driverimpls.pl line 29, <> line 27153. Can't open ../../src/../../src/lxc/lxc_monitor_protocol.c: No such file or directory at ../../src/check-driverimpls.pl line 29, <> line 27153. ... GEN check-aclrules cannot read ../../src/../../src/remote/remote_protocol.x at ../../src/check-aclrules.pl line 128. because $(srcdir) was being prepended to file names that already included it. * src/Makefile.am (check-driverimpls): Don't add srcdir twice. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 84372cb..62e427e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -499,11 +499,13 @@ STATEFUL_DRIVER_SOURCE_FILES = \ check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ $(filter /%,$(DRIVER_SOURCE_FILES)) \ - $(addprefix $(srcdir)/,$(filter-out /%,$(DRIVER_SOURCE_FILES))) + $(filter $(srcdir)/%,$(DRIVER_SOURCE_FILES)) \ + $(addprefix $(srcdir)/,$(filter-out $(srcdir)/%, \ + $(filter-out /%,$(DRIVER_SOURCE_FILES)))) check-aclrules: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \ - $(addprefix $(srcdir)/,$(filter-out /%,$(REMOTE_PROTOCOL))) \ + $(REMOTE_PROTOCOL) \ $(addprefix $(srcdir)/,$(filter-out /%,$(STATEFUL_DRIVER_SOURCE_FILES))) EXTRA_DIST += check-driverimpls.pl check-aclrules.pl -- 1.8.3.1

1 0

[libvirt] [PATCH] python: Drop TODO
by Cole Robinson 29 Jul '13

29 Jul '13

File hasn't been really touched for 7 years. And with recent rawhide changes it contributed to an RPM build failure. Let's drop it. This also removes installation of a libvirt-python doc dir, so drop handling of it from the RPM spec. --- libvirt.spec.in | 7 ------- python/Makefile.am | 7 ------- python/TODO | 6 ------ 3 files changed, 20 deletions(-) delete mode 100644 python/TODO diff --git a/libvirt.spec.in b/libvirt.spec.in index e0e0004..81101e8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1440,12 +1440,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug %endif -%if ! %{with_python} -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} -%else -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}/examples -%endif - %if ! %{with_qemu} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu @@ -2060,7 +2054,6 @@ fi %{_libdir}/python*/site-packages/libvirt_lxc.py* %{_libdir}/python*/site-packages/libvirtmod* %doc python/tests/*.py -%doc python/TODO %doc examples/python %doc examples/domain-events/events-python %endif diff --git a/python/Makefile.am b/python/Makefile.am index 9e957d1..7eb42c6 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -31,10 +31,6 @@ INCLUDES = \ AM_CFLAGS = $(WARN_CFLAGS) -DOCS_DIR = $(datadir)/doc/libvirt-python-$(VERSION) - -DOCS = ${srcdir}/TODO - CLASSES_EXTRA = \ libvirt-override-virConnect.py \ libvirt-override-virDomain.py \ @@ -152,9 +148,6 @@ install-data-local: $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) $(INSTALL) -m 0644 libvirt_lxc.py $(DESTDIR)$(pyexecdir) $(INSTALL) -m 0644 libvirt_qemu.py $(DESTDIR)$(pyexecdir) - $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) - @(for doc in $(DOCS) ; \ - do $(INSTALL) -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) uninstall-local: rm -f $(DESTDIR)$(pyexecdir)/libvirt.py diff --git a/python/TODO b/python/TODO deleted file mode 100644 index 4627482..0000000 --- a/python/TODO +++ /dev/null @@ -1,6 +0,0 @@ -- Need to complete, add custom wrapper function for those - which could not be handled fully automatically -- Check the names generated, iD is bad, fix the name generation routine -- add examples, web page and python based test suite - -Daniel Veillard -- 1.8.3.1

2 2

[libvirt] [PATCH 0/3] qemu: libvirt RDMA live migration support
by mrhines＠linux.vnet.ibm.com 29 Jul '13

29 Jul '13

From: "Michael R. Hines" <mrhines(a)us.ibm.com> QEMU has in tree now planned for 1.6 support for RDMA-based live migration. Changes to libvirt: 1. QEMU has a new 'setup' phase in their state machine. 2. Expose the 'x-rdma' migration protocol URI. 3. Expose the 'x-rdma-pin-all' capability for pre-registration of memory. Michael R. Hines (3): qemu: handle new 'setup' migration state qemu: RDMA migration support using 'x-rdma' URI qemu: memory pre-pinning support for RDMA migration include/libvirt/libvirt.h.in | 3 + src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 4 ++ src/qemu/qemu_command.c | 8 +++ src/qemu/qemu_migration.c | 131 ++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 7 ++- src/qemu/qemu_monitor.h | 13 +++++ src/qemu/qemu_monitor_json.c | 18 ++++++ tools/virsh-domain.c | 7 +++ 10 files changed, 178 insertions(+), 23 deletions(-) -- 1.7.10.4

5 15

[libvirt] [PATCH 0/2] Rework client connection handling
by Michal Privoznik 29 Jul '13

29 Jul '13

There are few cases where users don't want to raise 'max_client', but are doing many concurrent connection and don't want them to fail too. However, we are currently accept()-ing the incoming request even though we have reached the limit. If that's the case, error is reported and connection is thrown away. Gross. What about leaving the requests we know we can't handle yet in the listen() queue and accepting only those we know we can handle? For more info see: https://bugzilla.redhat.com/show_bug.cgi?id=981729 Michal Privoznik (2): RPC: Don't accept client if it would overcommit max_clients Introduce max_queued_clients daemon/libvirtd-config.c | 1 + daemon/libvirtd-config.h | 1 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 4 ++++ daemon/libvirtd.conf | 6 ++++++ src/locking/lock_daemon.c | 2 +- src/lxc/lxc_controller.c | 1 + src/rpc/virnetserver.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetserverservice.c | 15 +++++++++++++-- src/rpc/virnetserverservice.h | 6 ++++++ 10 files changed, 74 insertions(+), 3 deletions(-) -- 1.8.1.5

3 11

[libvirt] Entering freeze for libvirt-1.1.1
by Daniel Veillard 29 Jul '13

29 Jul '13

As planned I tagged the release candidate 1 for libvirt 1.1.1 in git, I also made tarball and rpms available on the ftp: ftp://libvirt.org/libvirt/ There is still some patches not completely ready after initial review it is probably safe to push the simplest ones, but not big sets now. Bug fixes are okay until final release obviously ! The release seems to work fine in my local testing (my fedora 19 crashed when shutdown a window guest, but that sounds like a kernel problem). Goal is to release next tuesday, please give it a try, and report problems :-) thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 5

[libvirt] [RFC] Image Fleecing for Libvirt (BZ 955734, 905125)
by Richard W.M. Jones 29 Jul '13

29 Jul '13

On Mon, Jul 15, 2013 at 05:57:12PM +0800, Fam Zheng wrote: > Hi all, > > QEMU-KVM BZ 955734, and libvirt BZ 905125 are about feature "Read-only > point-in-time throwaway snapshot". The development is ongoing on > upstream, which implements the core functionality by QMP command > drive-backup. I want to demonstrate the HMP/QMP commands here for image > fleecing tasks (again) and make sure this interface looks ready and > satisfying from Libvirt point of view. > > We get cheap point-in-time snapshot, and export it through built in NBD > server, by commands described below: > > 1. qemu-img create -f qcow2 -o backing_file=RUNNING-VM.img BACKUP.qcow2 > > (although the backing_file option is not honoured in the next step > because we *override* backing file with an existing > BlockDriverState, giving it here does no harm and also makes sure > the created image is of right size.) > > 2. (HMP) drive_add backing=ide0-hd0,file=BACKUP.qcow2,id=target0,if=none > > (where ide0-hd0 is the running BlockDriverState name for > RUNNING-VM.img) > > 3. (QMP) drive-backup device=ide0-hd0 mode=drive sync=none target=target0 > > (NewImageMode 'drive' means target is looked up as a device id, sync > mode 'none' means don't copy any data except copy-on-write the > point in time snapshot data) > > 4. (QMP) nbd-server-add device=target0 > > When image fleecing done: > > 1. (QMP) block-job-complete device=ide0-hd0 > > 2. (HMP) drive_del target0 > > 3. rm BACKUP.qcow2 > > Note: HMP drive_add/drive_del has no counterpart in QMP now but a new > command blockdev-add to do similar things is WIP, which can be an > alternative in QMP flavor. > > Any comments are welcome! > > -- > Best regards, > Fam Zheng -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

5 11

[libvirt] [PATCH] caps: use -device for primary video when qemu >=1.6
by Guannan Ren 29 Jul '13

29 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=981094 The commit 0ad9025ef introduce qemu flag QEMU_CAPS_DEVICE_VIDEO_PRIMARY for using -device VGA, -device cirrus-vga, -device vmware-svga and -device qxl-vga. In use, for -device qxl-vga, mouse doesn't display in guest window like the desciption in above bug. This patch try to use -device for primary video when qemu >=1.6 which is safe. --- src/qemu/qemu_capabilities.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5dc3c9e..08406b8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1189,8 +1189,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); } - if (version >= 1002000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); return 0; } @@ -2424,7 +2422,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); } /* Capabilities that are architecture depending @@ -2597,6 +2594,9 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, if (qemuCaps->version >= 1003001) virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET); + if (qemuCaps->version >= 1006000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) -- 1.8.3.1

3 5

Re: [libvirt] Entering freeze for libvirt-1.1.1
by Daniel Veillard 29 Jul '13

29 Jul '13

On Fri, Jul 26, 2013 at 06:01:23AM -0400, Alex Jia wrote: > Hello Daniel, > I gave a basic try for libvirt-1.1.1-rc1 on RHEL6. > > [root@202 libvirt-1.1.1]# make > > Notes, sometimes, I can meet the following errors, it's not reproducible each time, > maybe, it's a network issue. > > <slice> > > I/O error : Attempt to load network entity http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd > formatdomain.html.in:2: warning: failed to load external entity "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > ^ > formatdomain.html.in:4582: parser error : Entity 'mdash' not defined > <li> 'i6300esb' — the recommended device, you need to install xhtml1-dtds for local validation of generated HTML [...] > TEST: virnetsockettest > ........!!!.!!! 15 FAIL weird ... > Notes, works well with PATH environment setting, but it still is failed for > running 'make -C tests valgrind' due to previous 'make check' fails, whether > we my bypass/fix this for 'make check'. BTW, I also checked libvirt upstream > with "make -C tests valgrind", it's fine and without memory leaks. > > > [root@202 libvirt-1.1.1]# make syntax-check > GEN HACKING > GEN bracket-spacing-check > ./build-aux/vc-list-files: Failed to determine type of version control used in /home/ajia/Workspace/rc1/libvirt-1.1.1 > Can't open perl script "./build-aux/bracket-spacing.pl": No such file or directory > maint.mk: incorrect whitespace, see HACKING for rules > make: *** [bracket-spacing-check] Error 1 > > [root@202 libvirt-1.1.1]# ls ./build-aux/bracket-spacing.pl > ls: cannot access ./build-aux/bracket-spacing.pl: No such file or directory > > Notes, it's okay on libvirt upstream and can find ./build-aux/bracket-spacing.pl file. > > > To run coverity on libvirt-1.1.1-rc1 and attach report as an attachment. thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH] build: avoid uninitialized use warning
by Eric Blake 27 Jul '13

27 Jul '13

Otherwise, with new enough gcc compiling at -O2, the build fails with: ../../src/conf/domain_conf.c: In function ‘virDomainDeviceDefPostParse’: ../../src/conf/domain_conf.c:2821:29: error: ‘cnt’ may be used uninitialized in this function [-Werror=maybe-uninitialized] for (i = 0; i < *cnt; i++) { ^ ../../src/conf/domain_conf.c:2795:20: note: ‘cnt’ was declared here size_t i, *cnt; ^ ../../src/conf/domain_conf.c:2794:30: error: ‘arrPtr’ may be used uninitialized in this function [-Werror=maybe-uninitialized] virDomainChrDefPtr **arrPtr; ^ * src/conf/domain_conf.c (virDomainChrGetDomainPtrs): Always assign into output parameters. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. I actually found this while running ./autobuild.sh; but there, we run libtool in both static and shared modes, and libtool, in its "infinite wisdom", assumes that if the static build succeeds, then the shared build can have compiler output redirected to /dev/null, which meant I was stuck debugging this output: CC libvirt_driver_test_la-test_driver.lo CC libvirt_driver_remote_la-remote_driver.lo CC libvirt_driver_remote_la-remote_protocol.lo make[3]: *** [libvirt_conf_la-domain_conf.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... thanks for nothing, libtool. src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0e74039..a86be8c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10221,6 +10221,8 @@ virDomainChrGetDomainPtrs(virDomainDefPtr vmdef, break; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: + *arrPtr = NULL; + *cntPtr = NULL; break; } } -- 1.8.3.1

1 0

[libvirt] [PATCH] Fix probing of legacy Xen driver to not leave URI set
by Daniel P. Berrange 27 Jul '13

27 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When the legacy Xen driver probes with a NULL URI, and finds itself running on Xen, it will set conn->uri. A little bit later though it checks to see if libxl support exists, and if so declines the driver. This leaves the conn->uri set to 'xen:///', so if libxl also declines it, it prevents probing of the QEMU driver. Once a driver has set the conn->uri, it must *never* decline an open request. So we must move the libxl check earlier Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/xen/xen_driver.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 39334b7..4ae38d3 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -365,6 +365,13 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f if (!xenUnifiedProbe()) return VIR_DRV_OPEN_DECLINED; +#ifdef WITH_LIBXL + /* Decline xen:// URI if xend is not running and libxenlight + * driver is potentially available. */ + if (!xenUnifiedXendProbe()) + return VIR_DRV_OPEN_DECLINED; +#endif + if (!(conn->uri = virURIParse("xen:///"))) return VIR_DRV_OPEN_ERROR; } else { @@ -374,6 +381,12 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f STRCASENEQ(conn->uri->scheme, "http")) return VIR_DRV_OPEN_DECLINED; +#ifdef WITH_LIBXL + /* Decline xen:// URI if xend is not running and libxenlight + * driver is potentially available. */ + if (!xenUnifiedXendProbe()) + return VIR_DRV_OPEN_DECLINED; +#endif /* Return an error if the path isn't '' or '/' */ if (conn->uri->path && @@ -395,13 +408,6 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f } } -#ifdef WITH_LIBXL - /* Decline xen:// URI if xend is not running and libxenlight - * driver is potentially available. */ - if (!xenUnifiedXendProbe()) - return VIR_DRV_OPEN_DECLINED; -#endif - /* We now know the URI is definitely for this driver, so beyond * here, don't return DECLINED, always use ERROR */ -- 1.8.3.1

2 1

[libvirt] [PATCH] Set default partition in libvirtd instead of libvirt_lxc
by Daniel P. Berrange 26 Jul '13

26 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> By setting the default partition in libvirt_lxc it is not visible when querying the live XML. Move setting of the default partition into libvirtd virLXCProcessStart Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_cgroup.c | 14 -------------- src/lxc/lxc_process.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index af91b04..0b0ca02 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -433,20 +433,6 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) { virCgroupPtr cgroup = NULL; - if (!def->resource) { - virDomainResourceDefPtr res; - - if (VIR_ALLOC(res) < 0) - goto cleanup; - - if (VIR_STRDUP(res->partition, "/machine") < 0) { - VIR_FREE(res); - goto cleanup; - } - - def->resource = res; - } - if (def->resource->partition[0] != '/') { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Resource partition '%s' must start with '/'"), diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 1a5686f..247e516 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1007,6 +1007,20 @@ int virLXCProcessStart(virConnectPtr conn, return -1; } + if (!vm->def->resource) { + virDomainResourceDefPtr res; + + if (VIR_ALLOC(res) < 0) + goto cleanup; + + if (VIR_STRDUP(res->partition, "/machine") < 0) { + VIR_FREE(res); + goto cleanup; + } + + vm->def->resource = res; + } + if (virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name) < 0) return -1; -- 1.8.1.4

2 1

[libvirt] [PATCH v2 0/2] Split driver StateAutoStart from StateInitialization
by John Ferlan 26 Jul '13

26 Jul '13

This is an update to change the 'int' AutoStart function to 'void' as was discussed in the initial review: https://www.redhat.com/archives/libvir-list/2013-July/msg01674.html John Ferlan (2): Separate out StateAutoStart from StateInitialize virStateDriver - Separate AutoStart from Initialize src/driver.h | 4 ++++ src/libvirt.c | 14 +++++++++++++- src/libxl/libxl_driver.c | 16 +++++++++++++--- src/lxc/lxc_driver.c | 16 ++++++++++++++-- src/network/bridge_driver.c | 18 +++++++++++++++++- src/qemu/qemu_driver.c | 17 +++++++++++++++-- src/storage/storage_driver.c | 18 +++++++++++++++++- src/uml/uml_driver.c | 17 +++++++++++++++-- 8 files changed, 108 insertions(+), 12 deletions(-) -- 1.8.1.4

1 3

[libvirt] [PATCH 0/7] Probe QEMU binary for host CPU and use it for computations
by Jiri Denemark 26 Jul '13

26 Jul '13

Since QEMU and kvm may filter some host CPU features or add efficiently emulated features, asking QEMU binary for host CPU data provides better results when we later use the data for building guest CPUs. Jiri Denemark (7): cpu: Add support for loading and storing CPU data cpu: Export few x86-specific APIs x86: Ignore CPUID functions greater than 10 qemu: Add monitor APIs to fetch CPUID data from QEMU qemu: Make QMP probing process reusable qemu: Probe QEMU binary for host CPU qemu: Use host CPU from QEMU for computations src/cpu/cpu.c | 41 ++++ src/cpu/cpu.h | 13 ++ src/cpu/cpu_x86.c | 161 +++++++++++--- src/cpu/cpu_x86.h | 10 + src/cpu/cpu_x86_data.h | 1 + src/libvirt_private.syms | 9 + src/qemu/qemu_capabilities.c | 234 ++++++++++++++------- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 32 ++- src/qemu/qemu_domain.c | 21 +- src/qemu/qemu_monitor.c | 21 ++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 162 ++++++++++++++ src/qemu/qemu_monitor_json.h | 6 + tests/Makefile.am | 1 + .../qemumonitorjson-getcpu-empty.data | 2 + .../qemumonitorjson-getcpu-empty.json | 46 ++++ .../qemumonitorjson-getcpu-filtered.data | 4 + .../qemumonitorjson-getcpu-filtered.json | 46 ++++ .../qemumonitorjson-getcpu-full.data | 4 + .../qemumonitorjson-getcpu-full.json | 46 ++++ .../qemumonitorjson-getcpu-host.data | 5 + .../qemumonitorjson-getcpu-host.json | 45 ++++ tests/qemumonitorjsontest.c | 74 +++++++ 24 files changed, 881 insertions(+), 108 deletions(-) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-empty.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-empty.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-filtered.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-filtered.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-full.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-full.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-host.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-host.json -- 1.8.3.2

5 32

[libvirt] [PATCH 0/4] fix two issues about diskchain
by Guannan Ren 26 Jul '13

26 Jul '13

1, Report an backing missing error on guest boot if its disks have broken backing file chain 2, List volume even if its diskchain is broken Guannan Ren(4) [PATCH 1/4] qemu: refactor qemuDomainCheckDiskPresence for only disk [PATCH 2/4] qemu: report error if disk backing files doesn't exist [PATCH 3/4] qemu: check presence of each disk in chain [PATCH 4/4] storage: list volumes even if its diskchain is broken src/qemu/qemu_domain.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------- src/qemu/qemu_process.c | 7 ------- src/storage/storage_backend_fs.c | 4 +++- src/util/virstoragefile.c | 23 +++++++++++++++-------- tests/virstoragetest.c | 16 ++++++++-------- 5 files changed, 90 insertions(+), 68 deletions(-)

2 8

[libvirt] [PATCH] build: avoid -lgcrypt with newer gnutls
by Eric Blake 26 Jul '13

26 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=951637 Newer gnutls uses nettle, rather than gcrypt, which is a lot nicer regarding initialization. Yet we were unconditionally initializing gcrypt even when gnutls wouldn't be using it, and having two crypto libraries linked into libvirt.so is pointless. The ldd probe in configure borrows from our libnl-1 vs. libnl-3 code. * configure.ac (WITH_GNUTLS): Probe whether to add -lgcrypt, and define a witness WITH_GNUTLS_GCRYPT. * src/libvirt.c (virTLSMutexInit, virTLSMutexDestroy) (virTLSMutexLock, virTLSMutexUnlock, virTLSThreadImpl) (virGlobalInit): Honor the witness. * libvirt.spec.in (BuildRequires): Make gcrypt usage conditional, no longer needed in Fedora 19. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Tested with 'ldd src/.libs/libvirt.so | grep -E "(gcry|net|tls)"': - on RHEL 6.4 and Fedora 18, pre- and post-patch remain unchanged (use of just libgnutls/libgcrypt) - on Fedora 19, pre-patch linked against libgnutls, libgcrypt, and libnettle, post-patch linked against just libgnutls and libnettle This should probably go in for 1.1.1, but it's not a build-breaker so it needs review. configure.ac | 27 +++++++++++++++++++++------ libvirt.spec.in | 2 ++ src/libvirt.c | 10 ++++++---- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index cc9942a..de209e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1098,13 +1098,28 @@ if test "x$with_gnutls" != "xno"; then AC_MSG_ERROR([You must install the GnuTLS library in order to compile and run libvirt]) fi else - dnl Not all versions of gnutls include -lgcrypt, and so we add - dnl it explicitly for the calls to gcry_control/check_version - GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" - dnl We're not using gcrypt deprecated features so define - dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings - GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED" + dnl If gnutls linked against -lgcrypt, then we must initialize gcrypt + dnl prior to using gnutls. Newer versions of gnutls use -lnettle, in + dnl which case we don't want to drag in gcrypt ourselves. + gnutls_ldd= + for dir in /usr/lib64 /usr/lib /usr/lib/*-linux-gnu*; do + if test -f $dir/libgnutls.so; then + gnutls_ldd=`(ldd $dir/libgnutls.so) 2>&1` + break + fi + done + case $gnutls_ldd in + '' | *libgcrypt.so*) + GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" + dnl We're not using gcrypt deprecated features so define + dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings + GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED" + AC_DEFINE_UNQUOTED([WITH_GNUTLS_GCRYPT], 1, + [whether GNUTLS uses gcrypt]) + ;; + *) ;; # Assume no gcrypt usage + esac dnl gnutls 3.x moved some declarations to a new header AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[ diff --git a/libvirt.spec.in b/libvirt.spec.in index e0e0004..4320281 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -422,7 +422,9 @@ BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: libtasn1-devel +%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 19) BuildRequires: libgcrypt-devel +%endif BuildRequires: gnutls-devel BuildRequires: libattr-devel %if %{with_libvirtd} diff --git a/src/libvirt.c b/src/libvirt.c index 444c1c3..9775b97 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -55,7 +55,9 @@ #include "intprops.h" #include "virconf.h" #if WITH_GNUTLS -# include <gcrypt.h> +# if WITH_GNUTLS_GCRYPT +# include <gcrypt.h> +# endif # include "rpc/virnettlscontext.h" #endif #include "vircommand.h" @@ -270,7 +272,7 @@ winsock_init(void) #endif -#ifdef WITH_GNUTLS +#ifdef WITH_GNUTLS_GCRYPT static int virTLSMutexInit(void **priv) { virMutexPtr lock = NULL; @@ -323,7 +325,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { virTLSMutexUnlock, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -#endif +#endif /* WITH_GNUTLS_GCRYPT */ /* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but @@ -407,7 +409,7 @@ virGlobalInit(void) virErrorInitialize() < 0) goto error; -#ifdef WITH_GNUTLS +#ifdef WITH_GNUTLS_GCRYPT /* * This sequence of API calls it copied exactly from * gnutls 2.12.23 source lib/gcrypt/init.c, with -- 1.8.3.1

2 3

[libvirt] [PATCH 0/2] Split driver StateAutoStart from StateInitialization
by John Ferlan 26 Jul '13

26 Jul '13

The post push review/comments for the chap authentication determined that trying to connect to qemu driver from within the storage auto start would not be successful, see the following and followups https://www.redhat.com/archives/libvir-list/2013-July/msg01409.html These patches will split the virStateInitialize() into two phases - the first being the bulk of the existing code and the second being just running the auto start functionality for each of the drivers that needs/support it. I realize it's probably too late for 1.1.1, but figured it'd be good to be ready when the barn door opens again. John Ferlan (2): Separate out StateAutoStart from StateInitialize virStateDriver - Separate AutoStart from Initialize src/driver.h | 4 ++++ src/libvirt.c | 23 ++++++++++++++++++++++- src/libxl/libxl_driver.c | 18 +++++++++++++++--- src/lxc/lxc_driver.c | 18 ++++++++++++++++-- src/network/bridge_driver.c | 20 +++++++++++++++++++- src/qemu/qemu_driver.c | 18 ++++++++++++++++-- src/storage/storage_driver.c | 19 ++++++++++++++++++- src/uml/uml_driver.c | 18 ++++++++++++++++-- 8 files changed, 126 insertions(+), 12 deletions(-) -- 1.8.1.4

4 9

[libvirt] [PATCH 0/4] Test logical volume cloning in storagevolxml2argvtest
by Ján Tomko 26 Jul '13

26 Jul '13

Ján Tomko (4): Use separate macros for failure/success in vol-to-argv test Move pool XML out of storagevolxml2argvdata Move volume XMLs out of storagevolxml2argvdata Add inputpool to storagevolxml2argvtest .../storagevolxml2argvdata/logical-from-qcow2.argv | 2 + tests/storagevolxml2argvdata/pool-dir.xml | 18 --- .../storagevolxml2argvdata/qcow2-from-logical.argv | 2 + tests/storagevolxml2argvdata/vol-file.xml | 20 ---- tests/storagevolxml2argvdata/vol-qcow2-1.1.xml | 32 ------ tests/storagevolxml2argvtest.c | 128 ++++++++++++++++----- .../vol-qcow2-0.10-lazy.xml | 0 tests/storagevolxml2xmlin/vol-qcow2-1.1.xml | 2 +- tests/storagevolxml2xmlin/vol-qcow2-lazy.xml | 2 +- .../vol-qcow2-nobacking.xml | 0 tests/storagevolxml2xmlin/vol-qcow2.xml | 2 +- .../vol-qcow2-0.10-lazy.xml} | 8 +- tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 2 +- .../vol-qcow2-nobacking.xml} | 16 +-- tests/storagevolxml2xmlout/vol-qcow2.xml | 2 +- tests/storagevolxml2xmltest.c | 2 + 17 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 tests/storagevolxml2argvdata/logical-from-qcow2.argv delete mode 100644 tests/storagevolxml2argvdata/pool-dir.xml create mode 100644 tests/storagevolxml2argvdata/qcow2-from-logical.argv delete mode 100644 tests/storagevolxml2argvdata/vol-file.xml delete mode 100644 tests/storagevolxml2argvdata/vol-qcow2-1.1.xml rename tests/{storagevolxml2argvdata => storagevolxml2xmlin}/vol-qcow2-0.10-lazy.xml (100%) rename tests/{storagevolxml2argvdata => storagevolxml2xmlin}/vol-qcow2-nobacking.xml (100%) rename tests/{storagevolxml2argvdata/vol-qcow2-lazy.xml => storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml} (84%) rename tests/{storagevolxml2argvdata/vol-qcow2.xml => storagevolxml2xmlout/vol-qcow2-nobacking.xml} (55%) -- 1.8.1.5

3 13

[libvirt] [PATCH 0/4] Fix a pair of crashes in DNS XML parsing
by Ján Tomko 26 Jul '13

26 Jul '13

*** BLUAAARRRGHB HERE *** Ján Tomko (4): Set the number of elements to 0 in virNetwork*Clear Don't check validity of missing attributes in DNS SRV XML Remove double space in error messages Remove redundant free in virNetworkDNSHostDefParseXML src/conf/network_conf.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- 1.8.1.5

3 13

[libvirt] [PATCH] conf:Fix a copy paste error
by Alex Jia 26 Jul '13

26 Jul '13

Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10cb7f6..0e74039 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5153,7 +5153,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, xmlStrEqual(cur->name, BAD_CAST "product")) { product = (char *)xmlNodeGetContent(cur); - if (strlen(vendor) > PRODUCT_LEN) { + if (strlen(product) > PRODUCT_LEN) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk product is more than 16 characters")); goto error; -- 1.8.3.1

3 3

[libvirt] [PATCH] formatdomain.html.in: Correctly use <code/> in #elementQoS
by Michal Privoznik 26 Jul '13

26 Jul '13

Interestingly, we had <code>floor<code> ... </code>outbound</code> which results in much larger block of text to be written in code style that intended. --- docs/formatdomain.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7601aaa..d2cee67 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3539,12 +3539,12 @@ qemu-kvm -net nic,model=? /dev/null forward type of route, nat, or no forward at all). Moreover, the virtual network the interface is connected to is required to have at least inbound QoS set (<code>average</code> at least). Moreover, with - <code>floor<code> attribute users don't need to specify + <code>floor</code> attribute users don't need to specify <code>average</code>. However, <code>peak</code> and <code>burst</code> attributes still require <code>average</code>. Currently, linux kernel doesn't allow ingress qdiscs to have any classes therefore <code>floor</code> can be applied only on <code>inbound</code> and not - </code>outbound</code>. <span class="since">Since 1.0.1</span> + <code>outbound</code>. <span class="since">Since 1.0.1</span> </p> <h5><a name="elementVlanTag">Setting VLAN tag (on supported network types only)</a></h5> -- 1.8.1.5

2 3

[libvirt] [PATCH] Fix virsh snapshot-list error reporting
by Jim Fehlig 26 Jul '13

26 Jul '13

Noticed that the expected "not supported" error is dropped when invoking 'virsh snapshot-list dom' on a Xen installation running the libxl driver virsh snapshot-list test error: Invalid snapshot: virDomainSnapshotFree The error is overwritten by a call to virDomainSnapshotFree in cleanup code within cmdSnapshotList. Prevent overwritting the real error by not calling virDomainSnapshotFree with a NULL virDomainSnapshotPtr. --- This is one possible fix for the bug. The other would be to silently return in virDomainSnapshotFree on a NULL virDomainSnapshotPtr. tools/virsh-snapshot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index cfe8ee9..db9715b 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1678,7 +1678,8 @@ cleanup: vshSnapshotListFree(snaplist); VIR_FREE(parent_snap); VIR_FREE(state); - virDomainSnapshotFree(start); + if (start) + virDomainSnapshotFree(start); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(doc); -- 1.8.1.4

2 2

[libvirt] [PATCH 0/7] backport of getGroupList to v0.10.2-maint
by Eric Blake 26 Jul '13

26 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=964358 Since it was on Fedora 18 that I first noticed the deadlock possible when a child process calls getpwuid_r while the parent owned the lock in a different thread, I'm interested in backporting my recent work on virGetGroupList to v0.10.2-maint. However, I hit enough conflict resolution that I'd like a review of my backport decisions before pushing this to the stable branch. Daniel P. Berrange (1): Fix potential deadlock across fork() in QEMU driver Eric Blake (6): util: improve user lookup helper util: add virGetGroupList util: make virSetUIDGID async-signal-safe security: framework for driver PreFork handler security_dac: compute supplemental groups before fork security: fix deadlock with prefork configure.ac | 6 +- src/libvirt_private.syms | 3 + src/lxc/lxc_container.c | 2 +- src/qemu/qemu_process.c | 8 ++ src/security/security_dac.c | 56 ++++++++-- src/security/security_driver.h | 4 + src/security/security_manager.c | 30 +++++ src/security/security_manager.h | 3 + src/security/security_stack.c | 28 +++++ src/storage/storage_backend.c | 16 ++- src/util/util.c | 237 ++++++++++++++++++++++++---------------- src/util/util.h | 4 +- 12 files changed, 285 insertions(+), 112 deletions(-) -- 1.8.3.1

2 16

[libvirt] [PATCH 0/5] Fix detecting cgroups at libvirtd restart with QEMU
by Daniel P. Berrange 26 Jul '13

26 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The recent refactoring of cgroups broke the ability to detect cgroups for running guests in the QEMU driver during libvirtd startup. This was due to it not considering the existance of the 'emulator' child group, as well as not honouring the 'cgroups_controllers' setting when it was present Daniel P. Berrange (5): Introduce a more convenient virCgroupNewDetectMachine Make virCgroupIsValidMachine static Fix detection of 'emulator' cgroup Add 'controllers' arg to virCgroupNewDetect Skip detecting placement if controller is disabled src/libvirt_private.syms | 2 +- src/lxc/lxc_process.c | 20 +++++++--------- src/qemu/qemu_cgroup.c | 17 ++++---------- src/util/vircgroup.c | 60 +++++++++++++++++++++++++++++++++++++++++------- src/util/vircgroup.h | 12 ++++++---- 5 files changed, 73 insertions(+), 38 deletions(-) -- 1.8.1.4

2 12

[libvirt] Cannot compile libvirt
by Abhishek Sharma 26 Jul '13

26 Jul '13

Hi, I am new to libvirt and I am trying to compile libvirt from the git repository. I mainly plan to use it for managing ESX server. However I get the following error during make. *"libvirt undefined reference to virNetTLSInit"* Here are the steps which I took. 1. Get the code. git clone git://libvirt.org/libvirt.git 2. Run autogen ./autogen.sh --without-xen --with-esx --without-numactl --without-remote --without-libvirtd --without-one --without-openvz --without-qemu --without-uml --without-phyp --without-vbox --without-lxc --without-one --without-test --without-network --without-selinux --with-python 3. make Looks like the following commit somehow separated the gnutls symbols. *commit 83d7e4e4607a96b6959a6b0afd44a10a783fd928 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Wed Mar 13 13:37:29 2013 +0000 Use separate symbol file for GNUTLS symbols* How can I successfully compile libvirt ? Thanks, Abhishek

4 6

[libvirt] [PATCH] virdbustest: Don't pass number of arguments as long long
by Guido Günther 25 Jul '13

25 Jul '13

since sizeof(size_t) != sizeof(long long) on 32bit archs. This unbreaks virdbustest which otherwise fails like: (gdb) bt #0 __strlen_sse2_bsf () at ../sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S:50 #1 0x405907d2 in ?? () from /lib/i386-linux-gnu/libdbus-1.so.3 #2 0x4057c140 in ?? () from /lib/i386-linux-gnu/libdbus-1.so.3 #3 0x4057e7ec in dbus_message_iter_append_basic () from /lib/i386-linux-gnu/libdbus-1.so.3 #4 0x400742ec in virDBusMessageIterEncode (args=0xbfd4b8f0 "k\321\004\b.", types=0x804d260 "", rootiter=0xbfd4b844) at util/virdbus.c:560 #5 virDBusMessageEncodeArgs (msg=msg@entry=0x893c278, types=types@entry=0x804d25c "sais", args=args@entry=0xbfd4b8d8 "r\320\004\b\003") at util/virdbus.c:921 #6 0x40075917 in virDBusMessageEncode (msg=0x893c278, types=0x804d25c "sais") at util/virdbus.c:959 #7 0x0804a4a1 in testMessageArray (args=0x0) at virdbustest.c:195 #8 0x0804c404 in virtTestRun (title=title@entry=0x804cfcb "Test message array ", nloops=nloops@entry=1, body=body@entry=0x804a3f0 <testMessageArray>, data=data@entry=0x0) at testutils.c:168 #9 0x08049346 in mymain () at virdbustest.c:384 #10 0x0804cb2e in virtTestMain (argc=argc@entry=1, argv=argv@entry=0xbfd4bb24, func=func@entry=0x80492c0 <mymain>) at testutils.c:764 #11 0x080491af in main (argc=1, argv=0xbfd4bb24) at virdbustest.c:393 --- tests/virdbustest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virdbustest.c b/tests/virdbustest.c index e054716..ac57422 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -195,7 +195,7 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) if (virDBusMessageEncode(msg, "sais", in_str1, - (long long)3, in_int32a, in_int32b, in_int32c, + (size_t)3, in_int32a, in_int32b, in_int32c, in_str2) < 0) { VIR_DEBUG("Failed to encode arguments"); goto cleanup; -- 1.8.3.2

4 8

[libvirt] [PATCH] tests: PCI controller checks
by Ján Tomko 25 Jul '13

25 Jul '13

Check if PCI bridges with duplicate indexes are rejected. PCI root controllers with non-zero indexes or addresses should also be rejected. --- .../qemuxml2argv-pci-bridge-duplicate-index.xml | 16 ++++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml | 16 ++++++++++++++++ .../qemuxml2argv-pci-root-nonzero-index.xml | 14 ++++++++++++++ tests/qemuxml2argvtest.c | 6 ++++++ 4 files changed, 52 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-duplicate-index.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-root-nonzero-index.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-duplicate-index.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-duplicate-index.xml new file mode 100644 index 0000000..0aea45d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-duplicate-index.xml @@ -0,0 +1,16 @@ +<domain type='qemu'> + <name>fdr-br</name> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pci-root'/> + <controller type='pci' index='1' model='pci-bridge'/> + <controller type='pci' index='1' model='pci-bridge'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml new file mode 100644 index 0000000..7b43246 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-root-address.xml @@ -0,0 +1,16 @@ +<domain type='qemu'> + <name>fdr-br</name> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pci-root'> + <address type='pci' domain='0' bus='0' slot='0' function='0'/> + </controller> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-root-nonzero-index.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-root-nonzero-index.xml new file mode 100644 index 0000000..1a21d3b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-root-nonzero-index.xml @@ -0,0 +1,14 @@ +<domain type='qemu'> + <name>fdr-br</name> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='7' model='pci-root'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0f96eef..75f1c4a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1018,6 +1018,12 @@ mymain(void) DO_TEST_PARSE_ERROR("pci-bridge-negative-index-invalid", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST_PARSE_ERROR("pci-bridge-duplicate-index", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST_PARSE_ERROR("pci-root-nonzero-index", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST_PARSE_ERROR("pci-root-address", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); virObjectUnref(driver.config); virObjectUnref(driver.caps); -- 1.8.1.5

3 3

[libvirt] [PATCH v2] Don't overwrite errors in qemuTranslateDiskSourcePool
by Ján Tomko 25 Jul '13

25 Jul '13

Both virStoragePoolFree and virStorageVolFree reset the last error, which might lead to the cryptic message: An error occurred, but the cause is unknown When the volume wasn't found, virStorageVolFree was called with NULL, leading to an error: invalid storage volume pointer in virStorageVolFree This patch changes it to: Storage volume not found: no storage vol with matching name 'tomato' --- v1: https://www.redhat.com/archives/libvir-list/2013-July/msg01522.html v2: only save/restore the error when ret < 0 src/qemu/qemu_conf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3e7b78a..18e926c 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1248,6 +1248,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, char *poolxml = NULL; virStorageVolInfo info; int ret = -1; + virErrorPtr savedError = NULL; if (def->type != VIR_DOMAIN_DISK_TYPE_VOLUME) return 0; @@ -1324,8 +1325,17 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->voltype = info.type; ret = 0; cleanup: - virStoragePoolFree(pool); - virStorageVolFree(vol); + if (ret < 0) + savedError = virSaveLastError(); + if (pool) + virStoragePoolFree(pool); + if (vol) + virStorageVolFree(vol); + if (savedError) { + virSetError(savedError); + virFreeError(savedError); + } + VIR_FREE(poolxml); virStoragePoolDefFree(pooldef); return ret; -- 1.8.1.5

2 2

[libvirt] [PATCH 00/13] Support use of systemd-machined for cgroups
by Daniel P. Berrange 25 Jul '13

25 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This is a patch series which adds support for using systemd-machined for creating cgroups. The first 12 patches are all really just cleanups and refactoring. The actual systemd code is the last patch, but at time of posting it doesn't quite work properly. Given the freeze, I'd like to get the first 12 patches merged, while I iron out the remaining problems with the last patch. Daniel P. Berrange (13): Fix handling of DBus errors emitted by the bus itself Add logic for handling systemd-machined non-existance Add a virCgroupNewDetect API for finding cgroup placement Add API for checking if a cgroup is valid for a domain Auto-detect existing cgroup placement Remove obsolete cgroups creation apis Create + setup cgroups atomically for QEMU process Create + setup cgroups atomically for LXC process New cgroups API for atomically creating machine cgroups Convert QEMU driver to use virCgroupNewMachine Convert LXC driver to use virCgroupNewMachine Protection against doing bad stuff to the root group Enable support for systemd-machined in cgroups creation src/libvirt_private.syms | 5 +- src/lxc/lxc_cgroup.c | 82 +++------- src/lxc/lxc_cgroup.h | 2 +- src/lxc/lxc_controller.c | 19 +-- src/lxc/lxc_process.c | 52 +++++-- src/qemu/qemu_cgroup.c | 114 ++++++++------ src/qemu/qemu_cgroup.h | 5 +- src/qemu/qemu_process.c | 41 +++-- src/util/vircgroup.c | 388 +++++++++++++++++++++++++++++------------------ src/util/vircgroup.h | 32 ++-- src/util/virdbus.c | 5 +- src/util/virsystemd.c | 19 ++- tests/vircgrouptest.c | 112 -------------- tests/virsystemdmock.c | 14 +- tests/virsystemdtest.c | 63 +++++--- 15 files changed, 496 insertions(+), 457 deletions(-) -- 1.8.1.4

3 31

[libvirt] [PATCH v5 0/5] Support CHAP authentication for iscsi pool
by John Ferlan 25 Jul '13

25 Jul '13

This is a reworking and reposting of the authentication patches originally posted as part of my v3 reworking of Osier's original patches, see: https://www.redhat.com/archives/libvir-list/2013-July/msg00894.html Patch 7/7 was noted to be incorrect since the authentication was in the wrong place in the backend driver, see v3: https://www.redhat.com/archives/libvir-list/2013-July/msg00901.html and followups from my v2 posting: https://www.redhat.com/archives/libvir-list/2013-July/msg00910.html NOTE: Patch 4 (https://www.redhat.com/archives/libvir-list/2013-July/msg00960.html) was scrapped. Adjustments from previous patches 1. Using the same logic as Direct iSCSI, add the pool authentication info from the iSCSI pool to virDomainDiskDef's during qemuTranslateDiskSourcePool 2. Refactor the secret fetching code into one function for easier use 3. Refactor the volume building code into one function for easier use. This is where the magic to add the auth information to the disk occurs and now that it's part of the disk definition from the pool it will just 'be there' 4. Restore original intent to use startPool callback in order to authenticate the pool. Added a check for NULL connection. This just stops autostarting pools from getting authentication. This still needs to be fixed/resolved, but there just wasn't time in this release for that. 5. Split the rbd authentication code into it's own patch rather than being part of the iscsi patch 4. John Ferlan (5): qemu: Add source pool auth info to virDomainDiskDef for iSCSI qemu: Create a common qemuGetSecretString qemu_common: Create qemuBuildVolumeString() to process storage pool storage: Support "chap" authentication for iscsi pool Adjust 'ceph' authentication secret usage for rbd pool. src/qemu/qemu_command.c | 265 ++++++++++++++++++++---------------- src/qemu/qemu_conf.c | 55 ++++++++ src/storage/storage_backend_iscsi.c | 111 ++++++++++++++- src/storage/storage_backend_rbd.c | 21 ++- 4 files changed, 329 insertions(+), 123 deletions(-) -- 1.8.1.4

5 23

[libvirt] Call for Proposals: 2013 Linux Plumbers Virtualization Microconference
by Alex Williamson 25 Jul '13

25 Jul '13

The Call for Proposals for the 2013 Linux Plumbers Virtualization Microconference is now open. This uconf is being held as part of Linux Plumbers Conference in New Orleans, Louisiana, USA September 18-20th and is co-located with LinuxCon North America. For more information see: http://www.linuxplumbersconf.org/2013/ The tentative deadline for proposals is August 1st. To submit a topic please email a brief abstract to lpc2013-virt-mc(a)codemonkey.ws If you require travel assistance (extremely limited) in order to attend, please note that in your submission. Also, please keep an eye on: http://www.linuxplumbersconf.org/2013/submitting-topic/ http://www.linuxplumbersconf.org/2013/participate/ We've setup the above email submission as an interim approach until the LPC program committee brings the official submission tool online. I'll send a follow-up message when that occurs, but please send your proposals as soon as possible. Thanks, Alex

1 2

[libvirt] [PATCH] python: virConnect: fix destructor
by Sandro Bonazzola 25 Jul '13

25 Jul '13

Fixed virConnect destructor checking for attribute existance before trying to use it. Avoids: Exception AttributeError: AttributeError("virConnect instance has no attribute 'domainEventCallbacks'",) in <bound method virConnect.__del__ of <libvirt.virConnect instance at 0x4280f38>> ignored However, something still doesn't work: Exception TypeError: TypeError("'NoneType' object is not callable",) in <bound method virConnect.__del__ of <libvirt.virConnect object at 0x37576d0>> ignored Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- python/libvirt-override-virConnect.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 5495b70..28d6d41 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -1,11 +1,12 @@ def __del__(self): - try: - for cb,opaque in self.domainEventCallbacks.items(): - del self.domainEventCallbacks[cb] - del self.domainEventCallbacks - libvirtmod.virConnectDomainEventDeregister(self._o, self) - except AttributeError: - pass + if hasattr(self, 'domainEventCallbacks'): + try: + for cb,opaque in self.domainEventCallbacks.items(): + del self.domainEventCallbacks[cb] + del self.domainEventCallbacks + libvirtmod.virConnectDomainEventDeregister(self._o, self) + except AttributeError: + pass if self._o != None: libvirtmod.virConnectClose(self._o) @@ -14,14 +15,15 @@ def domainEventDeregister(self, cb): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ - try: - del self.domainEventCallbacks[cb] - if len(self.domainEventCallbacks) == 0: - del self.domainEventCallbacks - ret = libvirtmod.virConnectDomainEventDeregister(self._o, self) - if ret == -1: raise libvirtError ('virConnectDomainEventDeregister() failed', conn=self) - except AttributeError: - pass + if hasattr(self, 'domainEventCallbacks'): + try: + del self.domainEventCallbacks[cb] + if len(self.domainEventCallbacks) == 0: + del self.domainEventCallbacks + ret = libvirtmod.virConnectDomainEventDeregister(self._o, self) + if ret == -1: raise libvirtError ('virConnectDomainEventDeregister() failed', conn=self) + except AttributeError: + pass def domainEventRegister(self, cb, opaque): """Adds a Domain Event Callback. Registering for a domain -- 1.8.1.4

2 1

[libvirt] [PATCH] virLXCMonitorClose: Unlock domain while closing monitor
by Michal Privoznik 25 Jul '13

25 Jul '13

There's a race in lxc driver causing a deadlock. If a domain is destroyed immediately after started, the deadlock can occur. When domain is started, the even loop tries to connect to the monitor. If the connecting succeeds, virLXCProcessMonitorInitNotify() is called with @mon->client locked. The first thing that callee does, is virObjectLock(vm). So the order of locking is: 1) @mon->client, 2) @vm. However, if there's another thread executing virDomainDestroy on the very same domain, the first thing done here is locking the @vm. Then, the corresponding libvirt_lxc process is killed and monitor is closed via calling virLXCMonitorClose(). This callee tries to lock @mon->client too. So the order is reversed to the first case. This situation results in deadlock and unresponsive libvirtd (since the eventloop is involved). The proper solution is to unlock the @vm in virLXCMonitorClose prior entering virNetClientClose(). See the backtrace as follows: Thread 25 (Thread 0x7f1b7c9b8700 (LWP 16312)): 0 0x00007f1b80539714 in __lll_lock_wait () from /lib64/libpthread.so.0 1 0x00007f1b8053516c in _L_lock_516 () from /lib64/libpthread.so.0 2 0x00007f1b80534fbb in pthread_mutex_lock () from /lib64/libpthread.so.0 3 0x00007f1b82a637cf in virMutexLock (m=0x7f1b3c0038d0) at util/virthreadpthread.c:85 4 0x00007f1b82a4ccf2 in virObjectLock (anyobj=0x7f1b3c0038c0) at util/virobject.c:320 5 0x00007f1b82b861f6 in virNetClientCloseInternal (client=0x7f1b3c0038c0, reason=3) at rpc/virnetclient.c:696 6 0x00007f1b82b862f5 in virNetClientClose (client=0x7f1b3c0038c0) at rpc/virnetclient.c:721 7 0x00007f1b6ee12500 in virLXCMonitorClose (mon=0x7f1b3c007210) at lxc/lxc_monitor.c:216 8 0x00007f1b6ee129f0 in virLXCProcessCleanup (driver=0x7f1b68100240, vm=0x7f1b680ceb70, reason=VIR_DOMAIN_SHUTOFF_DESTROYED) at lxc/lxc_process.c:174 9 0x00007f1b6ee14106 in virLXCProcessStop (driver=0x7f1b68100240, vm=0x7f1b680ceb70, reason=VIR_DOMAIN_SHUTOFF_DESTROYED) at lxc/lxc_process.c:710 10 0x00007f1b6ee1aa36 in lxcDomainDestroyFlags (dom=0x7f1b5c002560, flags=0) at lxc/lxc_driver.c:1291 11 0x00007f1b6ee1ab1a in lxcDomainDestroy (dom=0x7f1b5c002560) at lxc/lxc_driver.c:1321 12 0x00007f1b82b05be5 in virDomainDestroy (domain=0x7f1b5c002560) at libvirt.c:2303 13 0x00007f1b835a7e85 in remoteDispatchDomainDestroy (server=0x7f1b857419d0, client=0x7f1b8574ae40, msg=0x7f1b8574acf0, rerr=0x7f1b7c9b7c30, args=0x7f1b5c004a50) at remote_dispatch.h:3143 14 0x00007f1b835a7d78 in remoteDispatchDomainDestroyHelper (server=0x7f1b857419d0, client=0x7f1b8574ae40, msg=0x7f1b8574acf0, rerr=0x7f1b7c9b7c30, args=0x7f1b5c004a50, ret=0x7f1b5c0029e0) at remote_dispatch.h:3121 15 0x00007f1b82b93704 in virNetServerProgramDispatchCall (prog=0x7f1b8573af90, server=0x7f1b857419d0, client=0x7f1b8574ae40, msg=0x7f1b8574acf0) at rpc/virnetserverprogram.c:435 16 0x00007f1b82b93263 in virNetServerProgramDispatch (prog=0x7f1b8573af90, server=0x7f1b857419d0, client=0x7f1b8574ae40, msg=0x7f1b8574acf0) at rpc/virnetserverprogram.c:305 17 0x00007f1b82b8c0f6 in virNetServerProcessMsg (srv=0x7f1b857419d0, client=0x7f1b8574ae40, prog=0x7f1b8573af90, msg=0x7f1b8574acf0) at rpc/virnetserver.c:163 18 0x00007f1b82b8c1da in virNetServerHandleJob (jobOpaque=0x7f1b8574dca0, opaque=0x7f1b857419d0) at rpc/virnetserver.c:184 19 0x00007f1b82a64158 in virThreadPoolWorker (opaque=0x7f1b8573cb10) at util/virthreadpool.c:144 20 0x00007f1b82a63ae5 in virThreadHelper (data=0x7f1b8574b9f0) at util/virthreadpthread.c:161 21 0x00007f1b80532f4a in start_thread () from /lib64/libpthread.so.0 22 0x00007f1b7fc4f20d in clone () from /lib64/libc.so.6 Thread 1 (Thread 0x7f1b83546740 (LWP 16297)): 0 0x00007f1b80539714 in __lll_lock_wait () from /lib64/libpthread.so.0 1 0x00007f1b8053516c in _L_lock_516 () from /lib64/libpthread.so.0 2 0x00007f1b80534fbb in pthread_mutex_lock () from /lib64/libpthread.so.0 3 0x00007f1b82a637cf in virMutexLock (m=0x7f1b680ceb80) at util/virthreadpthread.c:85 4 0x00007f1b82a4ccf2 in virObjectLock (anyobj=0x7f1b680ceb70) at util/virobject.c:320 5 0x00007f1b6ee13bd7 in virLXCProcessMonitorInitNotify (mon=0x7f1b3c007210, initpid=4832, vm=0x7f1b680ceb70) at lxc/lxc_process.c:601 6 0x00007f1b6ee11fd3 in virLXCMonitorHandleEventInit (prog=0x7f1b3c001f10, client=0x7f1b3c0038c0, evdata=0x7f1b8574a7d0, opaque=0x7f1b3c007210) at lxc/lxc_monitor.c:109 7 0x00007f1b82b8a196 in virNetClientProgramDispatch (prog=0x7f1b3c001f10, client=0x7f1b3c0038c0, msg=0x7f1b3c003928) at rpc/virnetclientprogram.c:259 8 0x00007f1b82b87030 in virNetClientCallDispatchMessage (client=0x7f1b3c0038c0) at rpc/virnetclient.c:1019 9 0x00007f1b82b876bb in virNetClientCallDispatch (client=0x7f1b3c0038c0) at rpc/virnetclient.c:1140 10 0x00007f1b82b87d41 in virNetClientIOHandleInput (client=0x7f1b3c0038c0) at rpc/virnetclient.c:1312 11 0x00007f1b82b88f51 in virNetClientIncomingEvent (sock=0x7f1b3c0044e0, events=1, opaque=0x7f1b3c0038c0) at rpc/virnetclient.c:1832 12 0x00007f1b82b9e1c8 in virNetSocketEventHandle (watch=3321, fd=54, events=1, opaque=0x7f1b3c0044e0) at rpc/virnetsocket.c:1695 13 0x00007f1b82a272cf in virEventPollDispatchHandles (nfds=21, fds=0x7f1b8574ded0) at util/vireventpoll.c:498 14 0x00007f1b82a27af2 in virEventPollRunOnce () at util/vireventpoll.c:645 15 0x00007f1b82a25a61 in virEventRunDefaultImpl () at util/virevent.c:273 16 0x00007f1b82b8e97e in virNetServerRun (srv=0x7f1b857419d0) at rpc/virnetserver.c:1097 17 0x00007f1b8359db6b in main (argc=2, argv=0x7ffff98dbaa8) at libvirtd.c:1512 --- src/lxc/lxc_monitor.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 999039b..07e9301 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -205,6 +205,9 @@ static void virLXCMonitorDispose(void *opaque) void virLXCMonitorClose(virLXCMonitorPtr mon) { + virDomainObjPtr vm; + virNetClientPtr client; + VIR_DEBUG("mon=%p", mon); if (mon->client) { /* When manually closing the monitor, we don't @@ -212,9 +215,18 @@ void virLXCMonitorClose(virLXCMonitorPtr mon) * the caller is not re-entrant safe */ VIR_DEBUG("Clear EOF callback mon=%p", mon); - mon->cb.eofNotify = NULL; - virNetClientClose(mon->client); - virObjectUnref(mon->client); + vm = mon->vm; + client = mon->client; mon->client = NULL; + mon->cb.eofNotify = NULL; + + virObjectRef(vm); + virObjectUnlock(vm); + + virNetClientClose(client); + virObjectUnref(client); + + virObjectLock(vm); + virObjectUnref(vm); } } -- 1.8.1.5

3 4

[libvirt] [PATCH V4] add console support in libxl
by Bamvor Jian Zhang 25 Jul '13

25 Jul '13

this patch introduce the console api in libxl driver for both pv and hvm guest. and import and update the libxlMakeChrdevStr function which was deleted in commit dfa1e1dd. Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> --- Changes since V3: implicity forbit dev_name pass to libxl driver due to only one console supported by libxl. Changes since V2: 1), forbid parallel configure because libxl do not support it 2), only support one serial on libxl driver. 3), also remove console code in libxl driver, AFAICS serial is enough for connecting to libxl console. Changes since V1: 1), add virDomainOpenConsoleEnsureACL 3), remove virReportOOMErrorFull when virAsprintf fail. 4), change size_t for non-nagetive number in libxlDomainOpenConsole size_t i; size_t num = 0; 5), fix for make check (1), replace virAsprintf with VIR_STRDUP in two places (2), delete space. src/libxl/libxl_conf.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_driver.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4a0fba9..539d537 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -331,6 +331,90 @@ error: } static int +libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) +{ + const char *type = virDomainChrTypeToString(def->source.type); + int ret; + + if (!type) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unexpected chr device type")); + return -1; + } + + switch (def->source.type) { + case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_STDIO: + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_PTY: + if (VIR_STRDUP(*buf, type) < 0) + return -1; + break; + + case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_PIPE: + if (virAsprintf(buf, "%s:%s", type, + def->source.data.file.path) < 0) + return -1; + break; + + case VIR_DOMAIN_CHR_TYPE_DEV: + if (VIR_STRDUP(*buf, def->source.data.file.path) < 0) + return -1; + break; + + case VIR_DOMAIN_CHR_TYPE_UDP: { + const char *connectHost = def->source.data.udp.connectHost; + const char *bindHost = def->source.data.udp.bindHost; + const char *bindService = def->source.data.udp.bindService; + + if (connectHost == NULL) + connectHost = ""; + if (bindHost == NULL) + bindHost = ""; + if (bindService == NULL) + bindService = "0"; + + ret = virAsprintf(buf, "udp:%s:%s@%s:%s", + connectHost, + def->source.data.udp.connectService, + bindHost, + bindService); + if (ret < 0) + return -1; + break; + + } + case VIR_DOMAIN_CHR_TYPE_TCP: + if (def->source.data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET) + ret = virAsprintf(buf, "telnet:%s:%s%s", + def->source.data.tcp.host, + def->source.data.tcp.service, + def->source.data.tcp.listen ? ",server,nowait" : ""); + else + ret = virAsprintf(buf, "tcp:%s:%s%s", + def->source.data.tcp.host, + def->source.data.tcp.service, + def->source.data.tcp.listen ? ",server,nowait" : ""); + + if (ret < 0) + return -1; + break; + + case VIR_DOMAIN_CHR_TYPE_UNIX: + ret = virAsprintf(buf, "unix:%s%s", + def->source.data.nix.path, + def->source.data.nix.listen ? ",server,nowait" : ""); + if (ret < 0) + return -1; + break; + + } + + return 0; +} + +static int libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) { libxl_domain_build_info *b_info = &d_config->b_info; @@ -403,6 +487,22 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) if (VIR_STRDUP(b_info->u.hvm.boot, bootorder) < 0) goto error; + if (def->nserials) { + if (def->nserials > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Only one serial is supported by libxl")); + goto error; + } + if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) < 0) + goto error; + } + + if (def->nparallels) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Parallel is not supported")); + goto error; + } + /* * The following comment and calculation were taken directly from * libxenlight's internal function libxl_get_required_shadow_memory(): diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 2b4a281..861d689 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -34,6 +34,7 @@ # include "configmake.h" # include "virportallocator.h" # include "virobject.h" +# include "virchrdev.h" # define LIBXL_VNC_PORT_MIN 5900 @@ -94,6 +95,8 @@ struct _libxlDomainObjPrivate { /* per domain libxl ctx */ libxl_ctx *ctx; + /* console */ + virChrdevsPtr devs; libxl_evgen_domain_death *deathW; /* list of libxl timeout registrations */ diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 358d387..9299484 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -417,6 +417,9 @@ libxlDomainObjPrivateAlloc(void) libxl_osevent_register_hooks(priv->ctx, &libxl_event_callbacks, priv); + if (!(priv->devs = virChrdevAlloc())) + return NULL; + return priv; } @@ -429,6 +432,7 @@ libxlDomainObjPrivateDispose(void *obj) libxl_evdisable_domain_death(priv->ctx, priv->deathW); libxl_ctx_free(priv->ctx); + virChrdevFree(priv->devs); } static void @@ -4493,6 +4497,95 @@ cleanup: return ret; } + +static int +libxlDomainOpenConsole(virDomainPtr dom, + const char *dev_name, + virStreamPtr st, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + int ret = -1; + virDomainChrDefPtr chr = NULL; + libxlDomainObjPrivatePtr priv; + char *console = NULL; + + virCheckFlags(VIR_DOMAIN_CONSOLE_SAFE | + VIR_DOMAIN_CONSOLE_FORCE, -1); + + if (dev_name) { + /* XXX support device aliases in future */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Named device aliases are not supported")); + goto cleanup; + } + + libxlDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); + libxlDriverUnlock(driver); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (virDomainOpenConsoleEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + priv = vm->privateData; + + if (vm->def->nserials) + chr = vm->def->serials[0]; + + if (!chr) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot find character device %s"), + NULLSTR(dev_name)); + goto cleanup; + } + + if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("character device %s is not using a PTY"), + NULLSTR(dev_name)); + goto cleanup; + } + + ret = libxl_primary_console_get_tty(priv->ctx, vm->def->id, &console); + if (ret) + goto cleanup; + + if (VIR_STRDUP(chr->source.data.file.path, console) < 0) + goto cleanup; + + /* handle mutually exclusive access to console devices */ + ret = virChrdevOpen(priv->devs, + &chr->source, + st, + (flags & VIR_DOMAIN_CONSOLE_FORCE) != 0); + + if (ret == 1) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Active console session exists for this domain")); + ret = -1; + } + +cleanup: + VIR_FREE(console); + if (vm) + virObjectUnlock(vm); + return ret; +} + static int libxlDomainSetSchedulerParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams) @@ -4875,6 +4968,7 @@ static virDriver libxlDriver = { .domainManagedSave = libxlDomainManagedSave, /* 0.9.2 */ .domainHasManagedSaveImage = libxlDomainHasManagedSaveImage, /* 0.9.2 */ .domainManagedSaveRemove = libxlDomainManagedSaveRemove, /* 0.9.2 */ + .domainOpenConsole = libxlDomainOpenConsole, /* 1.1.1 */ .domainIsActive = libxlDomainIsActive, /* 0.9.0 */ .domainIsPersistent = libxlDomainIsPersistent, /* 0.9.0 */ .domainIsUpdated = libxlDomainIsUpdated, /* 0.9.0 */ -- 1.8.1.4

2 1

[libvirt] [PATCH] libxl: Correctly initialize vcpu bitmap
by Stefan Bader 24 Jul '13

24 Jul '13

This fixes the basic setup but there is likely more to do if things like manual CPU hirarchy (nodes, cores, threads) to be working. Cross-posting to xen-devel to make sure I am doing things correctly. -Stefan >From 1ec5e7ea0d3498b9f61b83e8aed87cc3cae106de Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Fri, 19 Jul 2013 15:20:00 +0200 Subject: [PATCH] libxl: Correctly initialize vcpu bitmap The avai_vcpu bitmap has to be allocated before it can be used (using the maximum allowed value for that). Then for each available VCPU the bit in the mask has to be set (libxl_bitmap_set takes a bit position as an argument, not the number of bits to set). Without this, I would always only get one VCPU for guests created through libvirt/libxl. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/libxl/libxl_conf.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4a0fba9..7592dd2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -331,7 +331,8 @@ error: } static int -libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) +libxlMakeDomBuildInfo(libxlDriverPrivatePtr driver, virDomainDefPtr def, + libxl_domain_config *d_config) { libxl_domain_build_info *b_info = &d_config->b_info; int hvm = STREQ(def->os.type, "hvm"); @@ -343,8 +344,15 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) libxl_domain_build_info_init_type(b_info, LIBXL_DOMAIN_TYPE_HVM); else libxl_domain_build_info_init_type(b_info, LIBXL_DOMAIN_TYPE_PV); + b_info->max_vcpus = def->maxvcpus; - libxl_bitmap_set((&b_info->avail_vcpus), def->vcpus); + if (libxl_cpu_bitmap_alloc(driver->ctx, &b_info->avail_vcpus, + def->maxvcpus)) + goto error; + libxl_bitmap_set_none(&b_info->avail_vcpus); + for (i = 0; i < def->vcpus; i++) + libxl_bitmap_set((&b_info->avail_vcpus), i); + if (def->clock.ntimers > 0 && def->clock.timers[0]->name == VIR_DOMAIN_TIMER_NAME_TSC) { switch (def->clock.timers[0]->mode) { @@ -802,7 +810,7 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, if (libxlMakeDomCreateInfo(driver, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(def, d_config) < 0) { + if (libxlMakeDomBuildInfo(driver, def, d_config) < 0) { return -1; } -- 1.7.9.5

3 5

[libvirt] [PATCH] Fix link_addr detection
by Roman Bogorodskiy 24 Jul '13

24 Jul '13

link_addr detection in configure always reports that link_addr is missing because it uses link_addr(NULL, NULL) in AC_LINK_IFELSE check with limited set of headers that doesn't define NULL. Fix by replacing 'NULL' with just '0'. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 27531a1..cc9942a 100644 --- a/configure.ac +++ b/configure.ac @@ -2401,7 +2401,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( #include <net/if_dl.h> ]], [[ - link_addr(NULL, NULL)]])], + link_addr(0, 0)]])], [AC_DEFINE([HAVE_DECL_LINK_ADDR], [1], [whether link_addr is available])]) -- 1.7.11.5

2 2