- Devel - libvirt List Archives

[libvirt] [PATCH] po: Really fix po/POTFILES.in ordering
by Erik Skultety 10 Apr '16

10 Apr '16

Commit e72667bd tried to fix the incorrect file ordering in po/POTFILES.in except it didn't, since the sort was run using locale en_US instead of using locale C which is the default in libvirt. So this patch hopefully fixes it for good. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- po/POTFILES.in | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index dfc2ac2..ca23526 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ daemon/admin.c daemon/admin_dispatch.h -daemon/libvirtd.c daemon/libvirtd-config.c +daemon/libvirtd.c daemon/qemu_dispatch.h daemon/remote.c daemon/remote_dispatch.h @@ -26,8 +26,8 @@ src/conf/interface_conf.c src/conf/netdev_bandwidth_conf.c src/conf/netdev_vlan_conf.c src/conf/netdev_vport_profile_conf.c -src/conf/networkcommon_conf.c src/conf/network_conf.c +src/conf/networkcommon_conf.c src/conf/node_device_conf.c src/conf/numa_conf.c src/conf/nwfilter_conf.c @@ -62,9 +62,8 @@ src/interface/interface_backend_netcf.c src/interface/interface_backend_udev.c src/internal.h src/libvirt-admin.c -src/libvirt.c -src/libvirt-domain.c src/libvirt-domain-snapshot.c +src/libvirt-domain.c src/libvirt-host.c src/libvirt-lxc.c src/libvirt-network.c @@ -73,6 +72,7 @@ src/libvirt-qemu.c src/libvirt-secret.c src/libvirt-storage.c src/libvirt-stream.c +src/libvirt.c src/libxl/libxl_conf.c src/libxl/libxl_domain.c src/libxl/libxl_driver.c @@ -121,8 +121,8 @@ src/qemu/qemu_capabilities.c src/qemu/qemu_cgroup.c src/qemu/qemu_command.c src/qemu/qemu_conf.c -src/qemu/qemu_domain_address.c src/qemu/qemu_domain.c +src/qemu/qemu_domain_address.c src/qemu/qemu_driver.c src/qemu/qemu_hostdev.c src/qemu/qemu_hotplug.c @@ -205,9 +205,9 @@ src/util/virkeyfile.c src/util/virlease.c src/util/virlockspace.c src/util/virlog.c +src/util/virnetdev.c src/util/virnetdevbandwidth.c src/util/virnetdevbridge.c -src/util/virnetdev.c src/util/virnetdevmacvlan.c src/util/virnetdevmidonet.c src/util/virnetdevopenvswitch.c @@ -242,14 +242,14 @@ src/util/viruri.c src/util/virusb.c src/util/virutil.c src/util/virxml.c +src/vbox/vbox_MSCOMGlue.c +src/vbox/vbox_XPCOMCGlue.c src/vbox/vbox_common.c src/vbox/vbox_driver.c -src/vbox/vbox_MSCOMGlue.c src/vbox/vbox_network.c src/vbox/vbox_snapshot_conf.c src/vbox/vbox_storage.c src/vbox/vbox_tmpl.c -src/vbox/vbox_XPCOMCGlue.c src/vmware/vmware_conf.c src/vmware/vmware_driver.c src/vmx/vmx.c @@ -257,25 +257,24 @@ src/vz/vz_driver.c src/vz/vz_sdk.c src/vz/vz_utils.c src/vz/vz_utils.h -src/xenapi/xenapi_driver.c -src/xenapi/xenapi_utils.c src/xen/block_stats.c -src/xenconfig/xen_common.c -src/xenconfig/xen_sxpr.c -src/xenconfig/xen_xl.c -src/xenconfig/xen_xm.c -src/xen/xend_internal.c src/xen/xen_driver.c src/xen/xen_hypervisor.c src/xen/xen_inotify.c +src/xen/xend_internal.c src/xen/xm_internal.c src/xen/xs_internal.c +src/xenapi/xenapi_driver.c +src/xenapi/xenapi_utils.c +src/xenconfig/xen_common.c +src/xenconfig/xen_sxpr.c +src/xenconfig/xen_xl.c +src/xenconfig/xen_xm.c tests/virpolkittest.c tools/libvirt-guests.sh.in -tools/virsh.c tools/virsh-console.c -tools/virsh-domain.c tools/virsh-domain-monitor.c +tools/virsh-domain.c tools/virsh-edit.c tools/virsh-host.c tools/virsh-interface.c @@ -286,11 +285,12 @@ tools/virsh-pool.c tools/virsh-secret.c tools/virsh-snapshot.c tools/virsh-volume.c +tools/virsh.c tools/virt-admin.c -tools/virt-host-validate.c tools/virt-host-validate-common.c tools/virt-host-validate-lxc.c tools/virt-host-validate-qemu.c +tools/virt-host-validate.c tools/virt-login-shell.c tools/vsh.c tools/vsh.h -- 2.4.11

2 2

[libvirt] [PATCH] po: fix POTFILES.in file ordering
by Erik Skultety 10 Apr '16

10 Apr '16

When it comes to a situation that a new translatable file needs to be added into the list of files, an automatically generated patch is proposed during syntax-check. However, the diff was made against a sorted list of files and the same sorted list of files + the new file that actually needs to be added into the list. Since we do not keep POTFILES sorted, the proposed patch thus can't be applied...most of the time - depending on the context. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- po/POTFILES.in | 68 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 21d4cc6..dfc2ac2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ -daemon/admin_dispatch.h daemon/admin.c -daemon/libvirtd-config.c +daemon/admin_dispatch.h daemon/libvirtd.c +daemon/libvirtd-config.c daemon/qemu_dispatch.h daemon/remote.c daemon/remote_dispatch.h @@ -26,8 +26,8 @@ src/conf/interface_conf.c src/conf/netdev_bandwidth_conf.c src/conf/netdev_vlan_conf.c src/conf/netdev_vport_profile_conf.c -src/conf/network_conf.c src/conf/networkcommon_conf.c +src/conf/network_conf.c src/conf/node_device_conf.c src/conf/numa_conf.c src/conf/nwfilter_conf.c @@ -61,18 +61,22 @@ src/hyperv/hyperv_wmi.c src/interface/interface_backend_netcf.c src/interface/interface_backend_udev.c src/internal.h -src/libvirt.c src/libvirt-admin.c +src/libvirt.c src/libvirt-domain.c src/libvirt-domain-snapshot.c src/libvirt-host.c src/libvirt-lxc.c src/libvirt-network.c src/libvirt-nwfilter.c +src/libvirt-qemu.c src/libvirt-secret.c src/libvirt-storage.c src/libvirt-stream.c -src/libvirt-qemu.c +src/libxl/libxl_conf.c +src/libxl/libxl_domain.c +src/libxl/libxl_driver.c +src/libxl/libxl_migration.c src/locking/lock_daemon.c src/locking/lock_daemon_config.c src/locking/lock_daemon_dispatch.c @@ -86,19 +90,15 @@ src/logging/log_daemon_dispatch.c src/logging/log_handler.c src/logging/log_manager.c src/lxc/lxc_cgroup.c -src/lxc/lxc_fuse.c -src/lxc/lxc_hostdev.c -src/lxc/lxc_native.c -src/lxc/lxc_container.c src/lxc/lxc_conf.c +src/lxc/lxc_container.c src/lxc/lxc_controller.c src/lxc/lxc_domain.c src/lxc/lxc_driver.c +src/lxc/lxc_fuse.c +src/lxc/lxc_hostdev.c +src/lxc/lxc_native.c src/lxc/lxc_process.c -src/libxl/libxl_domain.c -src/libxl/libxl_driver.c -src/libxl/libxl_conf.c -src/libxl/libxl_migration.c src/network/bridge_driver.c src/network/bridge_driver_linux.c src/network/leaseshelper.c @@ -114,10 +114,6 @@ src/nwfilter/nwfilter_learnipaddr.c src/openvz/openvz_conf.c src/openvz/openvz_driver.c src/openvz/openvz_util.c -src/vz/vz_driver.c -src/vz/vz_sdk.c -src/vz/vz_utils.c -src/vz/vz_utils.h src/phyp/phyp_driver.c src/qemu/qemu_agent.c src/qemu/qemu_alias.c @@ -125,8 +121,8 @@ src/qemu/qemu_capabilities.c src/qemu/qemu_cgroup.c src/qemu/qemu_command.c src/qemu/qemu_conf.c -src/qemu/qemu_domain.c src/qemu/qemu_domain_address.c +src/qemu/qemu_domain.c src/qemu/qemu_driver.c src/qemu/qemu_hostdev.c src/qemu/qemu_hotplug.c @@ -146,12 +142,12 @@ src/rpc/virnetclientstream.c src/rpc/virnetdaemon.c src/rpc/virnetmessage.c src/rpc/virnetsaslcontext.c -src/rpc/virnetsocket.c src/rpc/virnetserver.c src/rpc/virnetserverclient.c src/rpc/virnetservermdns.c src/rpc/virnetserverprogram.c src/rpc/virnetserverservice.c +src/rpc/virnetsocket.c src/rpc/virnetsshsession.c src/rpc/virnettlscontext.c src/secret/secret_driver.c @@ -209,9 +205,9 @@ src/util/virkeyfile.c src/util/virlease.c src/util/virlockspace.c src/util/virlog.c -src/util/virnetdev.c src/util/virnetdevbandwidth.c src/util/virnetdevbridge.c +src/util/virnetdev.c src/util/virnetdevmacvlan.c src/util/virnetdevmidonet.c src/util/virnetdevopenvswitch.c @@ -230,8 +226,8 @@ src/util/virportallocator.c src/util/virprocess.c src/util/virrandom.c src/util/virrotatingfile.c -src/util/virsexpr.c src/util/virscsi.c +src/util/virsexpr.c src/util/virsocketaddr.c src/util/virstats.c src/util/virstorageencryption.c @@ -246,36 +242,40 @@ src/util/viruri.c src/util/virusb.c src/util/virutil.c src/util/virxml.c -src/vbox/vbox_MSCOMGlue.c -src/vbox/vbox_XPCOMCGlue.c -src/vbox/vbox_driver.c src/vbox/vbox_common.c +src/vbox/vbox_driver.c +src/vbox/vbox_MSCOMGlue.c src/vbox/vbox_network.c -src/vbox/vbox_storage.c src/vbox/vbox_snapshot_conf.c +src/vbox/vbox_storage.c src/vbox/vbox_tmpl.c +src/vbox/vbox_XPCOMCGlue.c src/vmware/vmware_conf.c src/vmware/vmware_driver.c src/vmx/vmx.c -src/xen/block_stats.c -src/xen/xen_driver.c -src/xen/xen_hypervisor.c -src/xen/xen_inotify.c -src/xen/xend_internal.c -src/xen/xm_internal.c -src/xen/xs_internal.c +src/vz/vz_driver.c +src/vz/vz_sdk.c +src/vz/vz_utils.c +src/vz/vz_utils.h src/xenapi/xenapi_driver.c src/xenapi/xenapi_utils.c +src/xen/block_stats.c src/xenconfig/xen_common.c src/xenconfig/xen_sxpr.c src/xenconfig/xen_xl.c src/xenconfig/xen_xm.c +src/xen/xend_internal.c +src/xen/xen_driver.c +src/xen/xen_hypervisor.c +src/xen/xen_inotify.c +src/xen/xm_internal.c +src/xen/xs_internal.c tests/virpolkittest.c tools/libvirt-guests.sh.in tools/virsh.c tools/virsh-console.c -tools/virsh-domain-monitor.c tools/virsh-domain.c +tools/virsh-domain-monitor.c tools/virsh-edit.c tools/virsh-host.c tools/virsh-interface.c @@ -287,10 +287,10 @@ tools/virsh-secret.c tools/virsh-snapshot.c tools/virsh-volume.c tools/virt-admin.c +tools/virt-host-validate.c tools/virt-host-validate-common.c tools/virt-host-validate-lxc.c tools/virt-host-validate-qemu.c -tools/virt-host-validate.c tools/virt-login-shell.c tools/vsh.c tools/vsh.h -- 2.4.11

3 4

[libvirt] Automatic Guest Resolution Adjustment not functional with GRsec guests
by bancfc＠openmailbox.org 10 Apr '16

10 Apr '16

A VM's QXL driver can no longer automatically adjust the screen resolution resize when running a GRsecurity kernel in the guest. The screen still responds to xrandr however but "scale display: always" in virt-manager doesn't work as it used to. What can be causing this?

2 2

[libvirt] [PATCH] qemu: fix build without gnutls installed
by Roman Bogorodskiy 10 Apr '16

10 Apr '16

Move including of gnutls/gnutls.h in qemu/qemu_domain.c under the "ifdef WITH_GNUTLS" check because otherwise it fails like this: CC qemu/libvirt_driver_qemu_impl_la-qemu_domain.lo qemu/qemu_domain.c:50:10: fatal error: 'gnutls/gnutls.h' file not found in case if gnutls is not installed on the system. --- src/qemu/qemu_domain.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 30dee4d..223154d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -47,9 +47,11 @@ #include "virprocess.h" #include "virrandom.h" #include "base64.h" -#include <gnutls/gnutls.h> -#if HAVE_GNUTLS_CRYPTO_H -# include <gnutls/crypto.h> +#ifdef WITH_GNUTLS +# include <gnutls/gnutls.h> +# if HAVE_GNUTLS_CRYPTO_H +# include <gnutls/crypto.h> +# endif #endif #include "logging/log_manager.h" #include "locking/domain_lock.h" -- 2.7.4

2 2

[libvirt] [PATCH] build: work around gcc 6.0 warnings
by Eric Blake 10 Apr '16

10 Apr '16

gcc 6.0 added an annoying warning: fdstream.c: In function 'virFDStreamWrite': fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op] if (errno == EAGAIN || errno == EWOULDBLOCK) { ^~ fdstream.c: In function 'virFDStreamRead': fdstream.c:440:29: error: logical 'or' of equal expressions [-Werror=logical-op] if (errno == EAGAIN || errno == EWOULDBLOCK) { ^~ This makes it impossible to build out-of-the-box on rawhide, and we aren't guaranteed that the gcc bug will be fixed in a timely manner: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 So work around it by further complicating the logic to thwart the compiler. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This is a build-breaker fix for rawhide; but I'll wait for a day for any reasons why I should not push it during freeze. src/fdstream.c | 8 +++++--- src/rpc/virnetsshsession.c | 10 +++++++--- src/security/security_selinux.c | 5 +++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index a85cf9d..1c34321 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -1,7 +1,7 @@ /* * fdstream.c: generic streams impl for file descriptors * - * Copyright (C) 2009-2012, 2014, 2016 Red Hat, Inc. + * Copyright (C) 2009-2012, 2014, 2016 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 @@ -387,7 +387,8 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) retry: ret = write(fdst->fd, bytes, nbytes); if (ret < 0) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { + if (errno == EAGAIN || + (EAGAIN != EWOULDBLOCK && errno == EWOULDBLOCK)) { ret = -2; } else if (errno == EINTR) { goto retry; @@ -437,7 +438,8 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) retry: ret = read(fdst->fd, bytes, nbytes); if (ret < 0) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { + if (errno == EAGAIN || + (EAGAIN != EWOULDBLOCK && errno == EWOULDBLOCK)) { ret = -2; } else if (errno == EINTR) { goto retry; diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 406a831..d7d1c1a 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -1,7 +1,7 @@ /* * virnetsshsession.c: ssh network transport provider based on libssh2 * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2013, 2016 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 @@ -546,7 +546,9 @@ virNetSSHAuthenticateAgent(virNetSSHSessionPtr sess, return 0; /* key accepted */ if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED && - ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED && + (LIBSSH2_ERROR_AUTHENTICATION_FAILED != + LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED && + ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED) && ret != LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, @@ -674,7 +676,9 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, priv->filename, errmsg); if (ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED || - ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) + (LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED != + LIBSSH2_ERROR_AUTHENTICATION_FAILED && + ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED)) return 1; else return -1; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 26d95d1..25f0bdf 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Red Hat, Inc. + * Copyright (C) 2008-2014, 2016 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 @@ -911,7 +911,8 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon, * hopefully sets one of the necessary SELinux virt_use_{nfs,usb,pci} * boolean tunables to allow it ... */ - if (setfilecon_errno != EOPNOTSUPP && setfilecon_errno != ENOTSUP && + if (setfilecon_errno != EOPNOTSUPP && + (EOPNOTSUPP != ENOTSUP && setfilecon_errno != ENOTSUP) && setfilecon_errno != EROFS) { virReportSystemError(setfilecon_errno, _("unable to set security context '%s' on '%s'"), -- 2.5.0

8 12

[libvirt] [PATCH] nss: properly include syms files to dist
by Roman Bogorodskiy 09 Apr '16

09 Apr '16

Explicitly add Linux and BSD syms files for nss to EXTRA_DIST instead of using the LIBVIRT_NSS_SYMBOL_FILE variable, because its value will point to either Linux or BSD syms file, but we need to ship both. --- tools/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 6005b8b..9cd62ae 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -473,8 +473,9 @@ lib_LTLIBRARIES = \ endif WITH_NSS -EXTRA_DIST += $(LIBVIRT_NSS_SYMBOL_FILE) \ - $(LIBVIRT_NSS_SOURCES) +EXTRA_DIST += $(LIBVIRT_NSS_SOURCES) \ + $(srcdir)/nss/libvirt_nss.syms \ + $(srcdir)/nss/libvirt_nss_bsd.syms clean-local: -rm -rf wireshark/src/libvirt -- 2.7.4

2 2

[libvirt] [PATCH] nss: fix typo in configure help string
by Roman Bogorodskiy 09 Apr '16

09 Apr '16

Servie -> Service Pushed as trivial. --- m4/virt-nss.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 index 3d6e8f4..bf5c416 100644 --- a/m4/virt-nss.m4 +++ b/m4/virt-nss.m4 @@ -20,7 +20,7 @@ dnl AC_DEFUN([LIBVIRT_CHECK_NSS],[ AC_ARG_WITH([nss-plugin], [AS_HELP_STRING([--with-nss-plugin], - [enable Name Servie Switch plugin for resolving guest IP addresses])], + [enable Name Service Switch plugin for resolving guest IP addresses])], [], [with_nss_plugin=check]) bsd_nss=no -- 2.7.4

1 0

[libvirt] [PATCH v2] Add macro for handling exponential backoff loops.
by Richard W.M. Jones 08 Apr '16

08 Apr '16

Since v1: - Rename the macro VIR_TIME_WHILE_WITH_BACKOFF. - Split out the variable initialization into a separate function that the user must call explicitly. - The macro is now an atomic C statement. An interesting observation about the qemu monitor socket: In some cases it appears almost instantaneously. In other runs it appears after 32-64ms. This latter case is what I expect because qemu startup takes ~50ms on my laptop. There seems to be no reason that I can discern for the difference between the runs. I've not observed the socket appearing anywhere in the middle, only at these two distinct time delays. Rich.

2 3

[libvirt] [PATCH] docs: Remove unused div.body CSS rule
by Andrea Bolognani 08 Apr '16

08 Apr '16

The 'body' CSS class is not used anywhere in the HTML files, so we can get rid of the definition as well. --- docs/generic.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/generic.css b/docs/generic.css index c0c6215..4f98b26 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -11,11 +11,6 @@ p:first-line { margin-right: 1em; } -div.body p:first-letter { - font-size: 1.2em; - font-weight: bold; -} - p, ul, ol, dl { padding: 0px; margin: 0px; -- 2.5.5

2 2

[libvirt] [PATCH 0/2] FreeBSD build fixes
by Andrea Bolognani 08 Apr '16

08 Apr '16

Applying these fixes building on FreeBSD, at least on my local builder (10.3-RELEASE). Cheers. Andrea Bolognani (2): configure: Move check for <gnutls/crypto.h> netdev: Use the correct pointer type for virSocketAddrFormat() configure.ac | 10 +++++----- src/util/virnetdev.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] util: netdev: Don't crash in virNetDevSetIPAddress if @peer is NULL
by Peter Krempa 08 Apr '16

08 Apr '16

VIR_SOCKET_ADDR_VALID dereferences the pointer, thus if we pass NULL into virNetDevSetIPAddress it crashes. Regression introduced by b3d069872ce53eb. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325120 --- src/util/virnetdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 712c3bc..0d030a3 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1129,7 +1129,7 @@ int virNetDevSetIPAddress(const char *ifname, unsigned int recvbuflen; /* The caller needs to provide a correct address */ - if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && !VIR_SOCKET_ADDR_VALID(peer)) { + if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && peer && !VIR_SOCKET_ADDR_VALID(peer)) { /* compute a broadcast address if this is IPv4 */ if (VIR_ALLOC(broadcast) < 0) return -1; -- 2.8.0

3 4

[libvirt] [PATCH v3 00/11] Introduce worker tuning APIs
by Erik Skultety 08 Apr '16

08 Apr '16

since v2: - all getters are now protected by threadpool mutex to prevent torn reads in concurrent execution - some checks in adminDispatchServerGetThreadpoolParameters were redundant, thus were optimizes out - fixed memory leak in adminDispatchServerGetThreadpoolParameters when allocating a newlist although typed params serialization already does that - fixed some cosmetic issues like exporting a function prototype one patch earlier than it should actually be introduced - a mistake that got there by interactive rebase Erik Skultety (11): po: Fix record ordering in POTFILES.in libvirt-host: Move virTypedParam* to libvirt-common admin: Enable usage of typed parameters util: Refactor thread creation by introducing virThreadPoolExpand util: Report system error when virThreadCreateFull fails util: Use a mutex when retrieving threadpool data util: Add more getters to threadpool parameters admin: Prepare admin protocol for future worker related procedures admin: Introduce virAdmServerGethreadPoolParameters admin: Introduce virAdmServerSetThreadPoolParameters virt-admin: Introduce srv-workertune command cfg.mk | 2 +- daemon/admin.c | 88 +++++++++++++ daemon/admin_server.c | 110 +++++++++++++++++ daemon/admin_server.h | 11 ++ include/libvirt/libvirt-admin.h | 71 +++++++++++ include/libvirt/libvirt-common.h.in | 185 ++++++++++++++++++++++++++++ include/libvirt/libvirt-host.h | 186 ---------------------------- po/POTFILES.in | 4 +- src/admin/admin_protocol.x | 54 +++++++- src/admin/admin_remote.c | 77 ++++++++++++ src/admin_protocol-structs | 45 +++++++ src/libvirt-admin.c | 83 +++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/libvirt_private.syms | 4 + src/rpc/virnetserver.c | 37 ++++++ src/rpc/virnetserver.h | 13 ++ src/util/virthreadpool.c | 238 +++++++++++++++++++++++++----------- src/util/virthreadpool.h | 8 ++ tools/virt-admin.c | 132 ++++++++++++++++++++ 20 files changed, 1096 insertions(+), 257 deletions(-) -- 2.4.11

1 12

[libvirt] [PATCH] Add macro for handling exponential backoff loops.
by Richard W.M. Jones 08 Apr '16

08 Apr '16

In a few places in libvirt we busy-wait for events, for example qemu creating a monitor socket. This is problematic because: - We need to choose a sufficiently small polling period so that libvirt doesn't add unnecessary delays. - We need to choose a sufficiently large polling period so that the effect of busy-waiting doesn't affect the system. The solution to this conflict is to use an exponential backoff. This patch adds a macro VIR_WHILE_EXPONENTIAL_BACKOFF to hide the details, and modifies a few places where we currently busy-wait. --- src/fdstream.c | 8 ++++---- src/libvirt_private.syms | 2 ++ src/qemu/qemu_agent.c | 8 ++++---- src/qemu/qemu_monitor.c | 8 ++++---- src/util/virtime.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/virtime.h | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 12 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index a85cf9d..7a311f5 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -42,6 +42,7 @@ #include "virfile.h" #include "configmake.h" #include "virstring.h" +#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_STREAMS @@ -516,8 +517,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, bool abstract) { struct sockaddr_un sa; - size_t i = 0; - int timeout = 3; + virTimeBackOffVar timeout; int ret; int fd = socket(AF_UNIX, SOCK_STREAM, 0); @@ -537,7 +537,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, goto error; } - do { + VIR_WHILE_EXPONENTIAL_BACKOFF(timeout, 1, 3*1000 /* ms */) { ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa)); if (ret == 0) break; @@ -549,7 +549,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, } goto error; - } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + } if (virFDStreamOpenInternal(st, fd, NULL, -1, 0) < 0) goto error; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 068bc00..b69d2e0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2360,6 +2360,8 @@ virThreadPoolSendJob; # util/virtime.h +virTimeBackOffCondition; +virTimeBackOffInit; virTimeFieldsNow; virTimeFieldsNowRaw; virTimeFieldsThen; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index bee8d4c..adf38c5 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -42,6 +42,7 @@ #include "virtime.h" #include "virobject.h" #include "virstring.h" +#include "virtime.h" #include "base64.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -173,9 +174,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) { struct sockaddr_un addr; int monfd; - int timeout = 3; /* In seconds */ + virTimeBackOffVar timeout; int ret; - size_t i = 0; *inProgress = false; @@ -207,7 +207,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) goto error; } - do { + VIR_WHILE_EXPONENTIAL_BACKOFF(timeout, 1, 3*1000 /* ms */) { ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); if (ret == 0) @@ -232,7 +232,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) _("failed to connect to monitor socket")); goto error; - } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + } if (ret != 0) { virReportSystemError(errno, "%s", diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 10a6713..52f0d20 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -42,6 +42,7 @@ #include "virobject.h" #include "virprobe.h" #include "virstring.h" +#include "virtime.h" #ifdef WITH_DTRACE_PROBES # include "libvirt_qemu_probes.h" @@ -327,9 +328,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) { struct sockaddr_un addr; int monfd; - int timeout = 30; /* In seconds */ + virTimeBackOffVar timeout; int ret; - size_t i = 0; if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, @@ -345,7 +345,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) goto error; } - do { + VIR_WHILE_EXPONENTIAL_BACKOFF(timeout, 1, 30*1000 /* ms */) { ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); if (ret == 0) @@ -362,7 +362,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) _("failed to connect to monitor socket")); goto error; - } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + } if (ret != 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virtime.c b/src/util/virtime.c index 9d365d5..78622e7 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -34,14 +34,18 @@ #include <config.h> #include <stdio.h> +#include <unistd.h> #include <sys/time.h> #include "virtime.h" #include "viralloc.h" #include "virerror.h" +#include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("util.time"); + /* We prefer clock_gettime if available because that is officially * async signal safe according to POSIX. Many platforms lack it * though, so fallback to gettimeofday everywhere else @@ -363,3 +367,41 @@ virTimeLocalOffsetFromUTC(long *offset) *offset = current - utc; return 0; } + +void +virTimeBackOffInit(virTimeBackOffVar *var, + unsigned long long first, unsigned long long limit) +{ + ignore_value(virTimeMillisNowRaw(&var->start_t)); + var->next = first; + var->limit = var->start_t + limit; +} + +int +virTimeBackOffCondition(virTimeBackOffVar *var) +{ + unsigned long long t, next; + + ignore_value(virTimeMillisNowRaw(&t)); + + VIR_DEBUG("t=%llu, limit=%llu", t, var->limit); + + if (t > var->limit) + return 0; /* ends the while loop */ + + next = var->next; + var->next *= 2; + + /* If sleeping would take us beyond the limit, then shorten the + * sleep. This is so we always run the body just before the final + * timeout. + */ + if (t + next > var->limit) { + next = var->limit - t - 2; + } + + VIR_DEBUG("sleeping for %llu ms", next); + + usleep(next * 1000); + return 1; +} diff --git a/src/util/virtime.h b/src/util/virtime.h index 8ebad38..723a93a 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -64,4 +64,43 @@ char *virTimeStringThen(unsigned long long when); int virTimeLocalOffsetFromUTC(long *offset) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +/** + * VIR_WHILE_EXPONENTIAL_BACKOFF: + * @var: A scratch variable used by the loop (with type virTimeBackOffVar). + * @first: First time period to wait, in milliseconds. + * @limit: Total time we run before the loop times out, in milliseconds. + * + * This macro is a while loop that runs the body of the code + * repeatedly, with an exponential backoff. It first waits for @first + * ms, then runs the body, then waits for 2*@first ms, then runs the + * body again. Then 4*@first ms, and so on. + * + * When @limit ms (total running time) is reached, the while loop + * ends. + * + * The body should use "break" or "goto" when whatever condition it is + * testing for succeeds (or there is an unrecoverable error). + * + * NOTE: VIR_WHILE_EXPONENTIAL_BACKOFF is not a single atomic C + * statement (unfortunately), so you will get incorrect code if you + * write something like: + * + * if (foo) + * VIR_WHILE_EXPONENTIAL_BACKOFF(...) { + * } + */ +#define VIR_WHILE_EXPONENTIAL_BACKOFF(var, first, limit) \ + virTimeBackOffInit(&(var), (first), (limit)); \ + while (virTimeBackOffCondition(&(var))) + +typedef struct { + unsigned long long start_t; + unsigned long long next; + unsigned long long limit; +} virTimeBackOffVar; + +void virTimeBackOffInit(virTimeBackOffVar *var, + unsigned long long first, unsigned long long limit); +int virTimeBackOffCondition(virTimeBackOffVar *var); + #endif -- 2.7.4

1 1

[libvirt] [PATCH] qemu: support virt-2.6 machine type on arm
by Ján Tomko 08 Apr '16

08 Apr '16

Some places already check for "virt-" prefix as well as plain "virt". virQEMUCapsHasPCIMultiBus did not, resulting in multiple PCI devices having assigned the same unnumbered "pci" alias. Add a test for the "virt-2.6" machine type which also omits the <model type='virtio'/> in <interface>, to check if qemuDomainDefaultNetModel works too. https://bugzilla.redhat.com/show_bug.cgi?id=1325085 --- src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_domain.c | 3 +- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 37 +++++++++++++++++ ...ml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 47 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5d09dc8..b73c296 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2174,7 +2174,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, /* If 'virt' supports PCI, it supports multibus. * No extra conditions here for simplicity. */ - if (STREQ(def->os.machine, "virt")) + if (STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) return true; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 55dcba8..30dee4d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1730,7 +1730,8 @@ qemuDomainDefaultNetModel(const virDomainDef *def, if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; - if (STREQ(def->os.machine, "virt")) + if (STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) return "virtio"; /* Incomplete. vexpress (and a few others) use this, but not all diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args new file mode 100644 index 0000000..93c181d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args @@ -0,0 +1,37 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-M virt-2.6 \ +-cpu cortex-a53 \ +-m 1024 \ +-smp 1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-boot c \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ +-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=objrng0,filename=/dev/random \ +-device virtio-rng-device,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml new file mode 100644 index 0000000..e745101 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml @@ -0,0 +1,47 @@ +<domain type="qemu"> + <name>aarch64test</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch="aarch64" machine="virt-2.6">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <dtb>/aarch64.dtb</dtb> + <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu match='exact'> + <model>cortex-a53</model> + </cpu> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <source file='/aarch64.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5f492cb..df42d9c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1661,6 +1661,12 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE); + DO_TEST("aarch64-virt-2.6-virtio-pci-default", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE); /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ DO_TEST("aarch64-virtio-pci-manual-addresses", -- 2.7.3

2 1

[libvirt] [PATCH v2] util: move ENODATA redefine to internal.h
by Roman Bogorodskiy 08 Apr '16

08 Apr '16

FreeBSD lacks ENODATA, and viruuid.c redefines it to EIO, but it's not actually using it. On the other hand, we have virrandom.c that's using ENODATA. So make this re-definition common by moving it to internal.h, so all the current and possible future users don't need to care about that. --- src/internal.h | 4 ++++ src/util/viruuid.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internal.h b/src/internal.h index db26fb0..9ebaf3c 100644 --- a/src/internal.h +++ b/src/internal.h @@ -517,4 +517,8 @@ enum { EXIT_ENOENT = 127, /* Could not find program to exec */ }; +# ifndef ENODATA +# define ENODATA EIO +# endif + #endif /* __VIR_INTERNAL_H__ */ diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 1fcc954..16e57db 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -46,10 +46,6 @@ VIR_LOG_INIT("util.uuid"); -#ifndef ENODATA -# define ENODATA EIO -#endif - static unsigned char host_uuid[VIR_UUID_BUFLEN]; static int -- 2.7.4

2 2

[libvirt] latest libvirt for centos 7
by Vasiliy Tolstov 08 Apr '16

08 Apr '16

Hi! Does centos have virt-preview like repo to try latest libvirt ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH v5 0/5] migration: add multithread compression
by Nikolay Shirokovskiy 08 Apr '16

08 Apr '16

Add means to turn multithread compression on during migration. Add means to pass compression parameters in migration command. WARNING! This should be pushed only after https://www.redhat.com/archives/libvir-list/2016-March/msg01506.html or virsh domain will break. Changes from v4 =============== 1. Clean up documentation and comments. 2. Stop keeping compression options in flags internally. Move flags data into generic compression structure. 3. Use existing libvirt enum infrastructure to deal with compression methods. This makes parse and dump function less painful. 4. Use booleans for 'set' flags instead of bitsets. 5. Othes minor changes on Jiri comments. Eli Qiao (1): qemumonitorjsontest: add test for getting multithread compress params Nikolay Shirokovskiy (2): migration: qemu: add option to select compression methods qemu: migration: support setting compession parameters ShaoHe Feng (2): qemu: monitor: add migration parameters accessors virsh: add compression options for migration include/libvirt/libvirt-domain.h | 42 +++++++ src/qemu/qemu_driver.c | 40 +++++- src/qemu/qemu_migration.c | 262 +++++++++++++++++++++++++++++++++++---- src/qemu/qemu_migration.h | 36 ++++++ src/qemu/qemu_monitor.c | 24 +++- src/qemu/qemu_monitor.h | 18 +++ src/qemu/qemu_monitor_json.c | 110 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 + tests/qemumonitorjsontest.c | 61 +++++++++ tools/virsh-domain.c | 76 ++++++++++++ tools/virsh.pod | 18 ++- 11 files changed, 656 insertions(+), 36 deletions(-) -- 1.8.3.1

1 6

[libvirt] [PATCH v2] add func to set shared drivers after libvirtd init
by Mikhail Feoktistov 08 Apr '16

08 Apr '16

Diff from v1: Remove vz prefix from the title of this letter. Because this is the common case for all drivers in libvirt. Description: Built-in drivers in libvirt are initialized before libvirtd initialization. Libvirt loads shared drivers on libvirtd initialization step. For built-in drivers we can't set shared drivers, because they are not initialized yet. This patch adds function to set shared drivers after libvirtd init. --- daemon/libvirtd.c | 4 ++++ src/libvirt.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 1 + 4 files changed, 47 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 250094b..aac1826 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -431,6 +431,10 @@ static void daemonInitialize(void) bhyveRegister(); # endif #endif +# ifdef WITH_VZ + virAssignSharedDrivers("vz"); + virAssignSharedDrivers("Parallels"); +# endif } diff --git a/src/libvirt.c b/src/libvirt.c index 25a0040..1763be7 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1433,3 +1433,44 @@ virTypedParameterValidateSet(virConnectPtr conn, } return 0; } + +/** + * virAssignSharedDrivers: + * @name: name of connection driver + * + * This function fills in any empty pointers for shared drivers + * in connect driver structure + * + * Returns 0 in case of success, -1 in case of error +*/ +int +virAssignSharedDrivers(const char *name) +{ + size_t i; + + if (name == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Driver name must be specified")); + return -1; + } + + for (i = 0; i < virConnectDriverTabCount; i++) { + if (STREQ(virConnectDriverTab[i]->hypervisorDriver->name, name)) { + if (virConnectDriverTab[i]->interfaceDriver == NULL) + virConnectDriverTab[i]->interfaceDriver = virSharedInterfaceDriver; + if (virConnectDriverTab[i]->networkDriver == NULL) + virConnectDriverTab[i]->networkDriver = virSharedNetworkDriver; + if (virConnectDriverTab[i]->nodeDeviceDriver == NULL) + virConnectDriverTab[i]->nodeDeviceDriver = virSharedNodeDeviceDriver; + if (virConnectDriverTab[i]->nwfilterDriver == NULL) + virConnectDriverTab[i]->nwfilterDriver = virSharedNWFilterDriver; + if (virConnectDriverTab[i]->secretDriver == NULL) + virConnectDriverTab[i]->secretDriver = virSharedSecretDriver; + if (virConnectDriverTab[i]->storageDriver == NULL) + virConnectDriverTab[i]->storageDriver = virSharedStorageDriver; + break; + } + } + + return 0; +} diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 1313b58..2a7227b 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -289,4 +289,5 @@ virTypedParameterValidateSet(virConnectPtr conn, virTypedParameterPtr params, int nparams); +int virAssignSharedDrivers(const char *name); #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a835f18..a0fcdf5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -943,6 +943,7 @@ virFDStreamSetInternalCloseCb; # libvirt_internal.h +virAssignSharedDrivers; virConnectSupportsFeature; virDomainMigrateBegin3; virDomainMigrateBegin3Params; -- 1.8.3.1

2 3

[libvirt] Unsupported network type ethernet
by sonia verma 08 Apr '16

08 Apr '16

Hi Team I need to launch LXC VM using ethernet network type using libvirt.While trying the same, I'm getting below errors .. *error: internal error: Unsupported network type ethernet* Is there any patch available to add ethernet support to Libvirt with LXC VM ? Please let me know regarding this. Thanks Sonia Verma

3 3

[libvirt] [PATCH] libxl: libxl_domain_create_restore has an extra argument
by Wei Liu 07 Apr '16

07 Apr '16

In the latest libxenlight code, libxl_domain_create_restore accepts a new argument. Update libvirt's libxl driver for that. Use the macro provided by libxenlight to detect which version should be used. The new parameter (send_back_fd) is set to -1 because libvirt provides no such fd. Signed-off-by: Wei Liu <wei.liu2(a)citrix.com> --- Build test with Xen 4.6.1 (old API) and Xen unstable (new API). --- src/libxl/libxl_domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 04962a0..aed904b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1070,7 +1070,12 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ret = libxl_domain_create_new(cfg->ctx, &d_config, &domid, NULL, &aop_console_how); } else { -#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS +#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD) + params.checkpointed_stream = 0; + ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, + restore_fd, -1, &params, NULL, + &aop_console_how); +#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS) params.checkpointed_stream = 0; ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, restore_fd, &params, NULL, -- 2.1.4

4 6

[libvirt] 200ms delay waiting for qemu monitor
by Richard W.M. Jones 07 Apr '16

07 Apr '16

[Thanks to Dan Berrangé for doing the analysis of this one] I was investigating a 200+ millisecond delay when libvirt starts a qemu guest. You can see the traces here: http://oirase.annexia.org/tmp/libvirt.log http://oirase.annexia.org/tmp/libvirtd.log The delay happens at around 16:52:57.327-6:52:57.528 in the libvirtd log. As you can see the delay is almost precisely 200ms. Dan found the cause which seems to be this code: https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/qemu/qemu_monitor.c;h=1… (There are other examples of the same anti-pattern in src/fdstream.c and src/qemu/qemu_agent.c, but it's the particular code above which seems to be causing the delay). To give you some sense why I regard this as a problem, the TOTAL time taken to launch and shutdown the libguestfs appliance (that includes qemu, BIOS, guest kernel, probing and mouting disks, running the guestfs daemon, and the shutdown process in reverse), without libvirt, is now 900ms. Libvirt adds about 220ms on top of this. What can we do about this? Obviously we could simply reduce the delay, but even if it was set to 20ms, that would be too much (aim is to reduce the whole process from 900ms down to 150ms), and it would also mean that libvirt was essentially polling. Can we use inotify to detect if the socket has been created? Seems to create portability problems. Dan suggested: Can we create the socket in libvirtd and pass it to qemu? Can we pass a file descriptor to qemu? Other suggestions? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

3 2

[libvirt] [PATCH v2 0/3] qemu: Explicitly check for gnutls_rnd()
by Andrea Bolognani 07 Apr '16

07 Apr '16

Patch 1 fixes a bug in configure. Patch 2 performs a minor cleanup. Patch 3 is the fix for the build issues currently experienced on CentOS 6 (see [1]). Changes from v1: * update CFLAGS and LIBS before performing the check, so that the compiler can actually find the function Cheers. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-daemon-build/systems… Andrea Bolognani (3): configure: Restore CFLAGS properly after GnuTLS checks configure: Always use old_CFLAGS and old_LIBS qemu: Explicitly check for gnutls_rnd() configure.ac | 31 +++++++++++++++++++------------ src/qemu/qemu_domain.c | 6 +++--- 2 files changed, 22 insertions(+), 15 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH v2] host-validate: Improve CPU flags processing
by Andrea Bolognani 07 Apr '16

07 Apr '16

Instead of relying on substring search, tokenize the input and process each CPU flag separately. This ensures CPU flag detection will continue to work correctly even if we start looking for CPU flags whose name might appear as part of other CPU flags' names. The result of processing is stored in a virBitmap, which means we don't have to parse /proc/cpuinfo in its entirety for each single CPU flag we want to check. Moreover, use of the newly-introduced virHostValidateCPUFlag enumeration ensures we don't go looking for random CPU flags which might actually be simple typos. --- Changes in v2: * use virStringSplitCount() and STRPREFIX() instead of strtok_r() and strcmp(), as suggested by Peter tools/virt-host-validate-common.c | 67 ++++++++++++++++++++++++++++++++------- tools/virt-host-validate-common.h | 13 +++++++- tools/virt-host-validate-qemu.c | 12 +++++-- 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 8ebf73e..3305a32 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -31,7 +31,6 @@ #endif /* HAVE_MNTENT_H */ #include <sys/stat.h> -#include "virutil.h" #include "viralloc.h" #include "virfile.h" #include "virt-host-validate-common.h" @@ -39,6 +38,10 @@ #define VIR_FROM_THIS VIR_FROM_NONE +VIR_ENUM_IMPL(virHostValidateCPUFlag, VIR_HOST_VALIDATE_CPU_FLAG_LAST, + "vmx", + "svm"); + static bool quiet; void virHostMsgSetQuiet(bool quietFlag) @@ -188,29 +191,64 @@ int virHostValidateNamespace(const char *hvname, } -bool virHostValidateHasCPUFlag(const char *name) +virBitmapPtr virHostValidateGetCPUFlags(void) { - FILE *fp = fopen("/proc/cpuinfo", "r"); - bool ret = false; + FILE *fp; + virBitmapPtr flags; - if (!fp) - return false; + if (!(fp = fopen("/proc/cpuinfo", "r"))) + return NULL; + + if (!(flags = virBitmapNewQuiet(VIR_HOST_VALIDATE_CPU_FLAG_LAST))) + return NULL; do { char line[1024]; + char *start; + char **tokens; + size_t ntokens; + size_t i; if (!fgets(line, sizeof(line), fp)) break; - if (strstr(line, name)) { - ret = true; - break; + /* The line we're interested in is marked either as "flags" or + * as "Features" depending on the architecture, so check both + * prefixes */ + if (!STRPREFIX(line, "flags") && !STRPREFIX(line, "Features")) + continue; + + /* fgets() includes the trailing newline in the output buffer, + * so we need to clean that up ourselves. We can safely access + * line[strlen(line) - 1] because the checks above would cause + * us to skip empty strings */ + line[strlen(line) - 1] = '\0'; + + /* Skip to the separator */ + if (!(start = strstr(line, ":"))) + continue; + + /* Split the line using " " as a delimiter. The first token + * will always be ":", but that's okay */ + if (!(tokens = virStringSplitCount(start, " ", 0, &ntokens))) + continue; + + /* Go through all flags and check whether one of those we + * might want to check for later on is present; if that's + * the case, set the relevant bit in the bitmap */ + for (i = 0; i < ntokens; i++) { + int value; + + if ((value = virHostValidateCPUFlagTypeFromString(tokens[i])) >= 0) + ignore_value(virBitmapSetBit(flags, value)); } + + virStringFreeListCount(tokens, ntokens); } while (1); VIR_FORCE_FCLOSE(fp); - return ret; + return flags; } @@ -359,15 +397,20 @@ int virHostValidateCGroupController(const char *hvname, int virHostValidateIOMMU(const char *hvname, virHostValidateLevel level) { + virBitmapPtr flags; struct stat sb; const char *bootarg = NULL; bool isAMD = false, isIntel = false; - if (virHostValidateHasCPUFlag("vmx")) + flags = virHostValidateGetCPUFlags(); + + if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX)) isIntel = true; - else if (virHostValidateHasCPUFlag("svm")) + else if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SVM)) isAMD = true; + virBitmapFree(flags); + virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); if (isIntel) { diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index d4c4759..26e006b 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -23,6 +23,8 @@ # define __VIRT_HOST_VALIDATE_COMMON_H__ # include "internal.h" +# include "virutil.h" +# include "virbitmap.h" typedef enum { VIR_HOST_VALIDATE_FAIL, @@ -32,6 +34,15 @@ typedef enum { VIR_HOST_VALIDATE_LAST, } virHostValidateLevel; +typedef enum { + VIR_HOST_VALIDATE_CPU_FLAG_VMX = 0, + VIR_HOST_VALIDATE_CPU_FLAG_SVM, + + VIR_HOST_VALIDATE_CPU_FLAG_LAST, +} virHostValidateCPUFlag; + +VIR_ENUM_DECL(virHostValidateCPUFlag); + extern void virHostMsgSetQuiet(bool quietFlag); extern void virHostMsgCheck(const char *prefix, @@ -53,7 +64,7 @@ extern int virHostValidateDeviceAccessible(const char *hvname, virHostValidateLevel level, const char *hint); -extern bool virHostValidateHasCPUFlag(const char *name); +extern virBitmapPtr virHostValidateGetCPUFlags(void); extern int virHostValidateLinuxKernel(const char *hvname, int version, diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index a9f6c1e..b96b020 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -24,14 +24,20 @@ #include "virt-host-validate-qemu.h" #include "virt-host-validate-common.h" +#include "virbitmap.h" int virHostValidateQEMU(void) { + virBitmapPtr flags; int ret = 0; virHostMsgCheck("QEMU", "%s", ("for hardware virtualization")); - if (virHostValidateHasCPUFlag("svm") || - virHostValidateHasCPUFlag("vmx")) { + + flags = virHostValidateGetCPUFlags(); + + if (flags && + (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SVM) || + virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX))) { virHostMsgPass(); if (virHostValidateDeviceExists("QEMU", "/dev/kvm", VIR_HOST_VALIDATE_FAIL, @@ -48,6 +54,8 @@ int virHostValidateQEMU(void) _("Only emulated CPUs are available, performance will be significantly limited")); } + virBitmapFree(flags); + if (virHostValidateDeviceExists("QEMU", "/dev/vhost-net", VIR_HOST_VALIDATE_WARN, _("Load the 'vhost_net' module to improve performance " -- 2.5.5

3 3

[libvirt] [PATCH] qemu: Check for gnutls_rnd() explicitly
by Andrea Bolognani 07 Apr '16

07 Apr '16

Our use of gnutls_rnd() is conditional to the availability of the <gnutls/crypto.h> header file. Such check, however, turns out not to be strict enough as there are some versions of gnutls (eg. 2.8.5 as available in CentOS 6) that provide the header file, but not the function itself, which was introduced in 2.12.0. Introduce an explicit check for the function itself. --- Would qualify as a build breaker (see [1]) but I'd rather have some feedback before pushing it. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-daemon-build/systems… configure.ac | 4 ++++ src/qemu/qemu_domain.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 85fc6e1..360674f 100644 --- a/configure.ac +++ b/configure.ac @@ -1286,6 +1286,10 @@ if test "x$with_gnutls" != "xno"; then #include <gnutls/gnutls.h> ]]) + dnl gnutls_rnd() was introduced in 2.12, so just checking for the + dnl corresponding header is not enough: we have to check for it explicitly + AC_CHECK_FUNCS([gnutls_rnd]) + with_gnutls=yes fi diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fa7cfc9..55dcba8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -635,8 +635,8 @@ qemuDomainGenerateRandomKey(size_t nbytes) if (VIR_ALLOC_N(key, nbytes) < 0) return NULL; -#if HAVE_GNUTLS_CRYPTO_H - /* Generate a master key using gnutls if possible */ +#if HAVE_GNUTLS_RND + /* Generate a master key using gnutls_rnd() if possible */ if ((ret = gnutls_rnd(GNUTLS_RND_RANDOM, key, nbytes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to generate master key, ret=%d"), ret); @@ -644,7 +644,7 @@ qemuDomainGenerateRandomKey(size_t nbytes) return NULL; } #else - /* If we don't have gnutls, we will generate a less cryptographically + /* If we don't have gnutls_rnd(), we will generate a less cryptographically * strong master key from /dev/urandom. */ if ((ret = virRandomBytes(key, nbytes)) < 0) { -- 2.5.5

1 1

[libvirt] [PATCH] qemu: perf: Fix crash/memory corruption on failed VM start
by Peter Krempa 07 Apr '16

07 Apr '16

The new perf code didn't bother to clear a pointer in 'priv' causing a double free or other memory corruption goodness if a VM failed to start. Clear the pointer after freeing the memory. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1324757 --- src/qemu/qemu_process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2b600c1..6c870f5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3444,6 +3444,7 @@ qemuDomainPerfRestart(virDomainObjPtr vm) cleanup: virPerfFree(priv->perf); + priv->perf = NULL; return -1; } @@ -5970,6 +5971,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virCgroupFree(&priv->cgroup); virPerfFree(priv->perf); + priv->perf = NULL; qemuProcessRemoveDomainStatus(driver, vm); -- 2.8.0

2 2