- Devel - libvirt List Archives

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

08 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 08 Apr '16

08 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

[libvirt] [PATCH 0/3] vz: add boot order support
by Nikolay Shirokovskiy 07 Apr '16

07 Apr '16

Let's add support for old school boot order via xml os section. Nikolay Shirokovskiy (3): vz: support boot order specification on define domain vz: fix disk order on load domain vz: support boot order in domain xml dump src/vz/vz_sdk.c | 390 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 341 insertions(+), 49 deletions(-) -- 1.8.3.1

2 9

[libvirt] [PATCH] util: move ENODATA redefine to virutil.h
by Roman Bogorodskiy 07 Apr '16

07 Apr '16

FreeBSD lacks ENODATA, and viruuid.c redefines it to EIO. However, now we have virrandom.c that's using ENODATA also, so move this re-definition to a common place, virutil.h, so it could fix things for both consumers. --- src/util/virutil.h | 4 ++++ src/util/viruuid.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virutil.h b/src/util/virutil.h index b121de0..36ed186 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -36,6 +36,10 @@ # define MAX(a, b) ((a) > (b) ? (a) : (b)) # endif +# ifndef ENODATA +# define ENODATA EIO +# endif + int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; 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

3 3

[libvirt] [PATCH 0/2] Fix alias asignment code for hotplugged RNGs/memory
by Peter Krempa 07 Apr '16

07 Apr '16

I messed up the original impl and then copied it to memory devices. Sigh. Peter Krempa (2): qemu: alias: Fix calculation of RNG device aliases qemu: alias: Fix calculation of memory device aliases src/qemu/qemu_alias.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_alias.h | 7 ++++++- src/qemu/qemu_hotplug.c | 4 ++-- 3 files changed, 53 insertions(+), 5 deletions(-) -- 2.8.0

2 5

[libvirt] [PATCH] nss: Simplify move_and_align
by Michal Privoznik 07 Apr '16

07 Apr '16

What this function does can be written much shorter. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/nss/libvirt_nss.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index de34baf..587b171 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -263,12 +263,10 @@ move_and_align(void *buf, size_t len, size_t *idx) char *buffer = buf; size_t move = LIBVIRT_ALIGN(len); - if (!idx) - return buffer + move; + if (idx) + *idx += move; - *idx += move; - - return buffer + *idx; + return buffer + move; } enum nss_status -- 2.7.3

2 1

[libvirt] [PATCH v2 0/4] Add a domain masterKey secret for qemu,
by John Ferlan 07 Apr '16

07 Apr '16

v1: http://www.redhat.com/archives/libvir-list/2016-March/msg01206.html Patch 1 is already ACK'd. I assume this code won't go into 1.3.3, but would hopefully be early in 1.3.4 and I didn't want to break up the capability bits across releases... Differences to v1 - Patch 2 is new - it's taking the virUUIDGenerateRandomBytes and making it generic since we'll use it in Patch 3 (it already opens/reads from /dev/urandom, so I figured it'd be better to share than cut, copy, paste). - Patch 3 has changes from review: * Less comments in qemuDomainGetMasterKeyFilePath * Master key no longer base64 encoded to be written (or read). Instead the Write code will open, truncate, and write the secret directly. The Read code will read the secret directly * The fallback algorithm for key generation uses virGenerateRandomBytes * Changed 'masterKey' from "char *" to "uint8_t *" and added the masterKeyLen - Patch 4 changes in order to tell qemu the format of the file is 'raw'. Also affects test .args file Removed references to encode/decode, adjusted commit messages. Ran through Coverity checker... happy... Created a domain that would pass/read the file... Killed libvirtd, restarted and read the masterKey file properly. Also ensured the #else of the secret generation compiled... John Ferlan (4): qemu: Add capability bit for qemu secret object util: Introduce virGenerateRandomBytes qemu: Create domain master key qemu: Introduce qemuBuildMasterKeyCommandLine src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 17 ++ src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 68 ++++++ src/qemu/qemu_domain.c | 252 +++++++++++++++++++++ src/qemu/qemu_domain.h | 15 ++ src/qemu/qemu_process.c | 11 + src/util/virutil.c | 36 +++ src/util/virutil.h | 3 + src/util/viruuid.c | 30 +-- tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 3 + .../qemuxml2argvdata/qemuxml2argv-master-key.args | 23 ++ tests/qemuxml2argvdata/qemuxml2argv-master-key.xml | 30 +++ tests/qemuxml2argvtest.c | 2 + 17 files changed, 469 insertions(+), 29 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-master-key.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-master-key.xml -- 2.5.5

2 9

[libvirt] [PATCH] Link xen driver against libxl
by Guido Günther 07 Apr '16

07 Apr '16

to avoid the test failure 7) Test driver "xen" ... 2016-03-31 12:53:26.950+0000: 22430: debug : virDriverLoadModule:54 : Module load xen 2016-03-31 12:53:26.950+0000: 22430: error : virDriverLoadModule:73 : failed to load module /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so: undefined symbol: xlu_cfg_destroy FAILED --- I have not yet investigated how this change came about so this is more of a RFC. src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1726d06..5f37607 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1218,7 +1218,9 @@ libvirt_driver_xen_impl_la_CFLAGS = \ -I$(srcdir)/xenconfig \ $(AM_CFLAGS) libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la +libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) \ + $(LIBXL_LIBS) \ + libvirt_xenconfig.la libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES) endif WITH_XEN -- 2.8.0.rc3

2 5

[libvirt] [PATCH v2] secret: Introduce virSecretGetSecretString
by John Ferlan 06 Apr '16

06 Apr '16

Commit id 'fb2bd208' essentially copied the qemuGetSecretString creating an libxlGetSecretString. Rather than have multiple copies of the same code, create src/secret/secret_util.{c,h} files and place the common function in there. Modify the the build in order to build the module as a library which is then pulled in by both the qemu and libxl drivers for usage from both qemu_command.c and libxl_conf.c Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- My Makefile.am skills are weak at best - not sure I got it totally right, but I think I'm at least close (it builds and links). po/POTFILES.in | 1 + src/Makefile.am | 17 ++++++- src/libvirt_private.syms | 4 ++ src/libxl/libxl_conf.c | 82 +++----------------------------- src/qemu/qemu_command.c | 87 ++++------------------------------ src/secret/secret_util.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ src/secret/secret_util.h | 35 ++++++++++++++ 7 files changed, 190 insertions(+), 156 deletions(-) create mode 100644 src/secret/secret_util.c create mode 100644 src/secret/secret_util.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 0d7f9f9..21d4cc6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -155,6 +155,7 @@ src/rpc/virnetserverservice.c src/rpc/virnetsshsession.c src/rpc/virnettlscontext.c src/secret/secret_driver.c +src/secret/secret_util.c src/security/security_apparmor.c src/security/security_dac.c src/security/security_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index 1726d06..5a3dd11 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -936,6 +936,9 @@ INTERFACE_DRIVER_SOURCES += \ endif WITH_UDEV endif WITH_INTERFACE +SECRET_UTIL_SOURCES = \ + secret/secret_util.h secret/secret_util.c + SECRET_DRIVER_SOURCES = \ secret/secret_driver.h secret/secret_driver.c @@ -1123,6 +1126,12 @@ libvirt_cpu_la_CFLAGS = \ -I$(srcdir)/conf $(AM_CFLAGS) libvirt_cpu_la_SOURCES = $(CPU_SOURCES) +noinst_LTLIBRARIES += libvirt_secret.la +libvirt_la_BUILT_LIBADD += libvirt_secret.la +libvirt_secret_la_CFLAGS = $(AM_CFLAGS) +libvirt_secret_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_secret_la_SOURCES = $(SECRET_UTIL_SOURCES) + if WITH_VMX noinst_LTLIBRARIES += libvirt_vmx.la libvirt_la_BUILT_LIBADD += libvirt_vmx.la @@ -1303,10 +1312,13 @@ libvirt_driver_libxl_impl_la_CFLAGS = \ $(LIBXL_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ + -I$(srcdir)/secret \ -I$(srcdir)/xenconfig \ $(AM_CFLAGS) libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenconfig.la +libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) \ + libvirt_xenconfig.la \ + libvirt_secret.la libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) conf_DATA += libxl/libxl.conf @@ -1337,12 +1349,14 @@ libvirt_driver_qemu_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ + -I$(srcdir)/secret \ $(AM_CFLAGS) libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_qemu_impl_la_LIBADD = $(CAPNG_LIBS) \ $(GNUTLS_LIBS) \ $(LIBNL_LIBS) \ $(LIBXML_LIBS) \ + libvirt_secret.la \ $(NULL) libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) @@ -1873,6 +1887,7 @@ EXTRA_DIST += \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ + $(SECRET_UTIL_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) \ $(VMWARE_DRIVER_SOURCES) \ $(XENCONFIG_SOURCES) \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 684f06c..a473158 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1038,6 +1038,10 @@ nodeGetThreadsPerSubcore; nodeSetMemoryParameters; +# secret/secret_util.h +virSecretGetSecretString; + + # security/security_driver.h virSecurityDriverLookup; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 82ba417..d16280d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -46,7 +46,7 @@ #include "libxl_conf.h" #include "libxl_utils.h" #include "virstoragefile.h" -#include "base64.h" +#include "secret_util.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -935,76 +935,6 @@ libxlDomainGetEmulatorType(const virDomainDef *def) return ret; } -static char * -libxlGetSecretString(virConnectPtr conn, - const char *scheme, - bool encoded, - virStorageAuthDefPtr authdef, - virSecretUsageType secretUsageType) -{ - size_t secret_size; - virSecretPtr sec = NULL; - char *secret = NULL; - char uuidStr[VIR_UUID_STRING_BUFLEN]; - - /* look up secret */ - switch (authdef->secretType) { - case VIR_STORAGE_SECRET_TYPE_UUID: - sec = virSecretLookupByUUID(conn, authdef->secret.uuid); - virUUIDFormat(authdef->secret.uuid, uuidStr); - break; - case VIR_STORAGE_SECRET_TYPE_USAGE: - sec = virSecretLookupByUsage(conn, secretUsageType, - authdef->secret.usage); - break; - } - - if (!sec) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches uuid '%s'"), - scheme, uuidStr); - } else { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches usage value '%s'"), - scheme, authdef->secret.usage); - } - goto cleanup; - } - - secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); - if (!secret) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using uuid '%s'"), - authdef->username, uuidStr); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using usage value '%s'"), - authdef->username, authdef->secret.usage); - } - goto cleanup; - } - - if (encoded) { - char *base64 = NULL; - - base64_encode_alloc(secret, secret_size, &base64); - VIR_FREE(secret); - if (!base64) { - virReportOOMError(); - goto cleanup; - } - secret = base64; - } - - cleanup: - virObjectUnref(sec); - return secret; -} static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, @@ -1100,11 +1030,11 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) if (!(conn = virConnectOpen("xen:///system"))) goto cleanup; - if (!(secret = libxlGetSecretString(conn, - protocol, - true, - src->auth, - VIR_SECRET_USAGE_TYPE_CEPH))) + if (!(secret = virSecretGetSecretString(conn, + protocol, + true, + src->auth, + VIR_SECRET_USAGE_TYPE_CEPH))) goto cleanup; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9001d06..9de9122 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -50,7 +50,7 @@ #include "secret_conf.h" #include "network/bridge_driver.h" #include "virnetdevtap.h" -#include "base64.h" +#include "secret_util.h" #include "device_conf.h" #include "virstoragefile.h" #include "virtpm.h" @@ -487,77 +487,6 @@ qemuSafeSerialParamValue(const char *value) return 0; } -static char * -qemuGetSecretString(virConnectPtr conn, - const char *scheme, - bool encoded, - virStorageAuthDefPtr authdef, - virSecretUsageType secretUsageType) -{ - size_t secret_size; - virSecretPtr sec = NULL; - char *secret = NULL; - char uuidStr[VIR_UUID_STRING_BUFLEN]; - - /* look up secret */ - switch (authdef->secretType) { - case VIR_STORAGE_SECRET_TYPE_UUID: - sec = virSecretLookupByUUID(conn, authdef->secret.uuid); - virUUIDFormat(authdef->secret.uuid, uuidStr); - break; - case VIR_STORAGE_SECRET_TYPE_USAGE: - sec = virSecretLookupByUsage(conn, secretUsageType, - authdef->secret.usage); - break; - } - - if (!sec) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches uuid '%s'"), - scheme, uuidStr); - } else { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches usage value '%s'"), - scheme, authdef->secret.usage); - } - goto cleanup; - } - - secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); - if (!secret) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using uuid '%s'"), - authdef->username, uuidStr); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using usage value '%s'"), - authdef->username, authdef->secret.usage); - } - goto cleanup; - } - - if (encoded) { - char *base64 = NULL; - - base64_encode_alloc(secret, secret_size, &base64); - VIR_FREE(secret); - if (!base64) { - virReportOOMError(); - goto cleanup; - } - secret = base64; - } - - cleanup: - virObjectUnref(sec); - return secret; -} - static int qemuNetworkDriveGetPort(int protocol, @@ -868,11 +797,11 @@ qemuGetDriveSourceString(virStorageSourcePtr src, secretType = VIR_SECRET_USAGE_TYPE_CEPH; } - if (!(secret = qemuGetSecretString(conn, - protocol, - encode, - src->auth, - secretType))) + if (!(secret = virSecretGetSecretString(conn, + protocol, + encode, + src->auth, + secretType))) goto cleanup; } } @@ -4458,8 +4387,8 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virConnectPtr conn, int secretType = VIR_SECRET_USAGE_TYPE_ISCSI; username = iscsisrc->auth->username; - if (!(secret = qemuGetSecretString(conn, protocol, encode, - iscsisrc->auth, secretType))) + if (!(secret = virSecretGetSecretString(conn, protocol, encode, + iscsisrc->auth, secretType))) goto cleanup; } diff --git a/src/secret/secret_util.c b/src/secret/secret_util.c new file mode 100644 index 0000000..217584f --- /dev/null +++ b/src/secret/secret_util.c @@ -0,0 +1,120 @@ +/* + * secret_util.c: secret related utility functions + * + * Copyright (C) 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 + * 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/>. + * + */ + +#include <config.h> + +#include "secret_util.h" +#include "viralloc.h" +#include "virerror.h" +#include "virlog.h" +#include "virobject.h" +#include "viruuid.h" +#include "base64.h" +#include "datatypes.h" + +#define VIR_FROM_THIS VIR_FROM_SECRET + +VIR_LOG_INIT("secret.secret_util"); + + +/* virSecretGetSecretString: + * @conn: Pointer to the connection driver to make secret driver call + * @scheme: Unique enough string for error message to help determine cause + * @encoded: Whether the returned secret needs to be base64 encoded + * @authdef: Pointer to the disk storage authentication + * @secretUsageType: Type of secret usage for authdef lookup + * + * Lookup the secret for the authdef usage type and return it either as + * raw text or encoded based on the caller's need. + * + * Returns a pointer to memory that needs to be cleared and free'd after + * usage or NULL on error. + */ +char * +virSecretGetSecretString(virConnectPtr conn, + const char *scheme, + bool encoded, + virStorageAuthDefPtr authdef, + virSecretUsageType secretUsageType) +{ + size_t secret_size; + virSecretPtr sec = NULL; + char *secret = NULL; + char uuidStr[VIR_UUID_STRING_BUFLEN]; + + /* look up secret */ + switch (authdef->secretType) { + case VIR_STORAGE_SECRET_TYPE_UUID: + sec = virSecretLookupByUUID(conn, authdef->secret.uuid); + virUUIDFormat(authdef->secret.uuid, uuidStr); + break; + case VIR_STORAGE_SECRET_TYPE_USAGE: + sec = virSecretLookupByUsage(conn, secretUsageType, + authdef->secret.usage); + break; + } + + if (!sec) { + if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { + virReportError(VIR_ERR_NO_SECRET, + _("%s no secret matches uuid '%s'"), + scheme, uuidStr); + } else { + virReportError(VIR_ERR_NO_SECRET, + _("%s no secret matches usage value '%s'"), + scheme, authdef->secret.usage); + } + goto cleanup; + } + + secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, + VIR_SECRET_GET_VALUE_INTERNAL_CALL); + if (!secret) { + if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("could not get value of the secret for " + "username '%s' using uuid '%s'"), + authdef->username, uuidStr); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("could not get value of the secret for " + "username '%s' using usage value '%s'"), + authdef->username, authdef->secret.usage); + } + goto cleanup; + } + + if (encoded) { + char *base64 = NULL; + + base64_encode_alloc(secret, secret_size, &base64); + VIR_FREE(secret); + if (!base64) { + virReportOOMError(); + goto cleanup; + } + secret = base64; + } + + cleanup: + virObjectUnref(sec); + return secret; +} diff --git a/src/secret/secret_util.h b/src/secret/secret_util.h new file mode 100644 index 0000000..c707599 --- /dev/null +++ b/src/secret/secret_util.h @@ -0,0 +1,35 @@ +/* + * secret_util.h: secret related utility functions + * + * Copyright (C) 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 + * 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/>. + * + */ + +#ifndef __VIR_SECRET_H__ +# define __VIR_SECRET_H__ + +# include "internal.h" +# include "virstoragefile.h" + +char *virSecretGetSecretString(virConnectPtr conn, + const char *scheme, + bool encoded, + virStorageAuthDefPtr authdef, + virSecretUsageType secretUsageType) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_RETURN_CHECK; +#endif /* __VIR_SECRET_H__ */ -- 2.5.5

2 1

[libvirt] [PATCH v5 0/6] storage:dir: ploop volumes support
by Olga Krishtal 06 Apr '16

06 Apr '16

This series of patches introduces the support of ploop volumes in storage pools (dir, fs, etc). Ploop volume is a disk loopback block device consists of root.hds (it is the image file) and DiskDescriptor.xml: https://openvz.org/Ploop/format. Due to this fact it can't be treated as file or any other volume type, moreover, in order to successfully manipulate with such volume, ploop tools should be installed. All callbacks except the wipeVol are supported. First patch introduces ploop volume type. This is a directory with two files inside. The name of the directory is the name of the volume. Patch 2 deals with creating an empty volume and cloning the existing one. Clone is done via simle cp operation. If any of this operation fails - directory will be deleted. Patch 3 deletes recursively ploop directory. Patch 4 uses ploop tool to resize volume. Patch 6 adapts all refreshing functions to work with ploop. To get information the directory is checked. The volume is treated as the ploops one only if it contains ploop files. Every time the pool is refreshed DiskDescriptor.xml is restored. This is necessary, because the content of the volume may have changed. Upload and download (patch 7) can't be done if the volume contains snapshots. v5: - added ploop volume type - there is no change in opening volume functions. Now reopening takes place is the volume is ploops one. - restore DiskDescriptor.xml every refresh pool - all information, except format is taken from header - forbidden upload and download ops for volume with snapshots - there is no separate function for deleting the volume - fixed identation and leaks v4: - fixed identation issues. - in case of .uploadVol, DiskDescriptor.xml is restored. - added check of ploops'accessibility v3: - no VIR_STORAGE_VOL_PLOOP type any more - adapted all patches according to previous change - fixed comments v2: - fixed memory leak - chenged the return value of all helper functions to 0/-1. Now check for success is smth like that: vir****Ploop() < 0 - fixed some identation issues.

2 13

[libvirt] [PATCH] virt-admin: get rid of LIBVIRT_DEFAULT_ADMIN_URI env var
by Ján Tomko 06 Apr '16

06 Apr '16

There is a LIBVIRT_ADMIN_DEFAULT_URI environment variable which is honored by virAdmConnectOpen and documented in the virt-admin man page. LIBVIRT_DEFAULT_ADMIN_URI is undocumented and this is its only occurrence. --- tools/virt-admin.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index edb8690..f0a49a3 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -670,7 +670,6 @@ main(int argc, char **argv) { vshControl _ctl, *ctl = &_ctl; vshAdmControl virtAdminCtl; - const char *defaultConn; bool ret = true; memset(ctl, 0, sizeof(vshControl)); @@ -719,9 +718,6 @@ main(int argc, char **argv) virFileActivateDirOverride(argv[0]); - if ((defaultConn = virGetEnvBlockSUID("LIBVIRT_DEFAULT_ADMIN_URI"))) - ctl->connname = vshStrdup(ctl, defaultConn); - if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); -- 2.4.10

2 1

[libvirt] [PATCH 0/3] tools: virsh/virt-admin uri handling spring series 2016
by Ján Tomko 06 Apr '16

06 Apr '16

*** <____""/.a... *** Ján Tomko (3): tools: read default connection uri from env later tools: remove unnecessary defaultConn variable libvirt-admin: do not crash on URI without a scheme src/libvirt-admin.c | 4 ++-- tools/virsh.c | 6 ++---- tools/virt-admin.c | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) -- 2.4.10

2 6

[libvirt] [PATCH] spec: Include KVM support on RHEL 7 ppc64 and newer
by Andrea Bolognani 06 Apr '16

06 Apr '16

--- Definitely not an expert on spec files, but I did a test build on RHEL 7.2 ppc64le and it resulted in libvirt-daemon-driver-qemu-1.3.3-1.el7.ppc64le.rpm libvirt-daemon-kvm-1.3.3-1.el7.ppc64le.rpm libvirt-lock-sanlock-1.3.3-1.el7.ppc64le.rpm being built in addition to what was built even before, so it looks reasonable I guess? Comments very welcome :) libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 03e2438..fdea12a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -77,7 +77,11 @@ %if 0%{?rhel} %define with_qemu_tcg 0 - %define qemu_kvm_arches x86_64 + %if 0%{?rhel} >= 7 + %define qemu_kvm_arches x86_64 %{power64} + %else + %define qemu_kvm_arches x86_64 + %endif %endif %ifarch %{qemu_kvm_arches} -- 2.5.0

2 5

[libvirt] Release of libvirt-1.3.3
by Daniel Veillard 06 Apr '16

06 Apr '16

With a bit of delay the release is now out and git is open again, I tagged the release in head, and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ UI also tagged and pushed signed tarball and rpms for the python bindings for 1.3.3 at: ftp://libvirt.org/libvirt/python/ This is a rather large lreales with a lot of development and user visible features. The majority of the nearly 400 commits are incremental improvements (which may explain why stabilization for release took a little longuer than usual), but there is a decent amount of bug fixes too! Features: - perf events (Qiaowei Ren) - post-copy migration support (Cristian Klein, Jiri Denemark) - NSS module (Michal Privoznik) Documentation: - docs: fix logfile paragraph (Boris Fiuczynski) - docs: Remove useless p:first-line CSS rule (Andrea Bolognani) - docs: Remove unused #sponsor CSS rule (Andrea Bolognani) - docs: Make most headers a bit smaller (Andrea Bolognani) - docs: Use bold text for all headers (Andrea Bolognani) - docs: Don't use bold text for menu entries (Andrea Bolognani) - docs: Make menu entries smaller (Andrea Bolognani) - docs: Don't use in headers (Andrea Bolognani) - docs: Remove empty CSS rule (Andrea Bolognani) - docs: Adjust vertical whitespace in CSS (Andrea Bolognani) - docs: fix qemu version for hyperv features (Pavel Hrdina) - docs: Document NSS module (Michal Privoznik) - docs: website: more header spacing tweaks (Cole Robinson) - docs: Update the hyperv feature qemu supported version (John Ferlan) - docs: generic.css: Indentation and spacing tweaks (Cole Robinson) - docs: generic.css: font size tweaks (Cole Robinson) - docs: generic.css: minor cleanups (Cole Robinson) - docs: website: Remove the et.redhat.com footer (Cole Robinson) - Fix minor typos (Yuri Chornoivan) - docs: Clarify interface/target/@dev docs (Jiri Denemark) Portability: - build: workaround broken SASL header (again) (Fabiano Fidêncio) - nss: FreeBSD support (Roman Bogorodskiy) - perf: fix build on non-Linux (Roman Bogorodskiy) - storage: rbd: Fix build (Peter Krempa) - storage/rbd: Use correct printf-modifier for uint64 (Christophe Fergeau) - tests: Produce predictable results in nsstest (Michal Privoznik) - nss: don't try to build nss plugin when disabled (Roman Bogorodskiy) - virlog: Fix build breaker with "comparison between signed and unsigned" (Erik Skultety) - _virtualboxCreateMachine: Avoid unbounded stack (Michal Privoznik) - datatypes.c: Replace 'close' with 'closeData' (Michal Privoznik) - util: Fix build without polkit (Jiri Denemark) Bug Fixes: - qemu: Fix mis-merge of qemuBuildRedirdevCommandLine (John Ferlan) - qemu: Fix mis-merge of qemuBuildConsoleCommandLine (John Ferlan) - qemu: Fix mis-merge of qemuBuildChannelsCommandLine (John Ferlan) - qemu: Fix mis-merge of qemuBuildParallelsCommandLine (John Ferlan) - qemu: Fix mis-merge of qemuBuildSerialCommandLine (John Ferlan) - qemu: Fix mis-merge of qemuBuildSmartcardCommandLine (John Ferlan) - nodedev: Fix parsing of generated XMLs (Martin Kletzander) - qemu: fix alias name for <interface type='hostdev'> (Laine Stump) - qemu: Clear generated private paths (Martin Kletzander) - apparmor: QEMU monitor socket moved (Guido Günther) - Revert "hostdev: Use actual device when reattaching" (Andrea Bolognani) - Pass the correct cpu count when calling virDomainGetCPUStats. (Nitesh Konkar) - migration: convert speed from MiB/sec to bytes/sec in drive-mirror jobs (Rudy Zhang) - libxl: fix net device detach (Jim Fehlig) - libxl: fix attaching net device of type hostdev (Jim Fehlig) - qemuProcessVerifyGuestCPU: Avoid coverity false positive (Michal Privoznik) - virDomain{Get,Set}PerfEvents: support --config --live --current (Michal Privoznik) - qemu: command: Pass numad nodeset when formatting memory devices at boot (Peter Krempa) - libxl: only disable domain death events in libxlDomainCleanup (Jim Fehlig) - libxl: fix resource leaks in libxlDomainStart error paths (Chunyan Liu) - conf: decrease iterations complexity when formatting iothreads (Peter Krempa) - qemu: Fix /proc/**/stat parsing (Jiri Denemark) - bhyve: fix invalid hostsysinfo freeing (Maxim Nestratov) - libxl: remove reference to non-existent out label (Jim Fehlig) - util: avoid getting stuck on macvtapN name created outside libvirt (Laine Stump) - libxl: fix hot add/remove VF from a pool (Chunyan Liu) - tests: storagepoolxml2xmltest: Fix pool-rbd test (Anatole Denis) - Revert "zfs: Only raw volumes are supported" (Roman Bogorodskiy) - Revert "logical: Only raw volumes are supported" (Roman Bogorodskiy) - network: differentiate macvtap/bridge from host-bridge based networks (Laine Stump) - test: Fix typo in testutils.h header guard (Christophe Fergeau) - virTestSetEnvPath: Avoid clearing out PATH (Michal Privoznik) - admin_server: Avoid accessing unallocated memory (Michal Privoznik) - testutils: Adapt to highly unlikely case (Michal Privoznik) - tests: virlogtest: Fix testLogParseOutputs return value (Erik Skultety) - admin_server: fix memory leak (Pavel Hrdina) - qemu: Don't kill running migrated domain on daemon restart (Jiri Denemark) - qemu: Don't add -spice port=0 when no port is specified (Christophe Fergeau) - rpc: wait longer for session daemon to start up (Cole Robinson) - qemu: Don't access uninitialized memory (Martin Kletzander) - vz: fix active domain listing (Maxim Nestratov) - qemuBuildVideoCommandLine: Don't access def->videos without check (Michal Privoznik) - virt-admin: Don't leak uri in cmdSrvList (Martin Kletzander) - daemon: Properly check for clients (Martin Kletzander) - qemuxml2argvtest: Fix monitor path in serial-file-log (Jiri Denemark) - qemu: support use of virtlogd with file based chardevs (Daniel P. Berrange) - qemu: use virtlogd for character device log files (Daniel P. Berrange) - qemu: cpu: Don't remove pinning of cold-unplugged cpu (Peter Krempa) - qemu: Fix memory leak in qemuGetSchedInfo (Peter Krempa) - conf: Fix off-by-one in virDomainDefGetVcpu (Peter Krempa) - qemu: Fix a race when computing migration downtime (Jiri Denemark) - qemu: rename: Forbid renaming domains with managed save image (Peter Krempa) - virLXCProcessMonitorInitNotify: Initialize @inode (Michal Privoznik) - tools: do not leak uri in disconnect handler (Ján Tomko) - Initialize couple of variables. (Michal Privoznik) - qemu: Check if domain is active in GetControlInfo (Jiri Denemark) - daemon: fixup refcounting in close callback handling (Nikolay Shirokovskiy) - util: Fix missing initializer for agent (John Ferlan) - Libvirt: Add missing default value for config option max_queued_clients (Jason J. Herne) - qemu: Don't always wait for SPICE to finish migration (Jiri Denemark) - qemu: Don't try to fetch migration stats on destination (Jiri Denemark) - close callback: make unregister clean after connect close event (Nikolay Shirokovskiy) - virConnectCloseCallbackData: fix connection object refcount (Nikolay Shirokovskiy) Improvements: - network: Remove extraneous ATTRIBUTE_NONNULL (John Ferlan) - qemu: change args to qemuAssignDeviceHostdevAlias() (Laine Stump) - network: new function networkGetActualType (Laine Stump) - qemu: Simplify calls to qemuDomainSetPrivatePaths (Martin Kletzander) - qemu: perf: Tweak flags before using them (Peter Krempa) - virPerfReadEvent: Prefer saferead over read (Michal Privoznik) - remote: Add flags to remote_protocol-structs (Martin Kletzander) - virDomain{Get,Set}PerfEvents: Grab job (Michal Privoznik) - virsh: Make perf accept event list separated by commas (Michal Privoznik) - virsh: Prefer VIRSH_COMMON_OPT_DOMAIN_FULL over full enumeration (Michal Privoznik) - virDomain{Get,Set}PerfEvents: Add @flags argument (Michal Privoznik) - remoteDomainGetPerfEvents: Re-indent (Michal Privoznik) - qemu: command: Split up formatting of -numa and memory devices (Peter Krempa) - qemu_process: add check for hyperv features (Pavel Hrdina) - qemu_process: skip only cpu features (Pavel Hrdina) - host-validate: Fix suggestion for missing cpu cgroup (Andrea Bolognani) - libxl: rename cleanup_dom label (Jim Fehlig) - conf: Remove now unused virDomainIOThreadIDMap (Peter Krempa) - util: bitmap: Introduce self-expanding bitmap APIs (Peter Krempa) - virsh: blockpull: Support --bytes and scaled integers (Peter Krempa) - virsh: blockcopy: Support --bytes and scaled integers (Peter Krempa) - virsh: blockcommit: Support --bytes and scaled integers (Peter Krempa) - virsh: blockjob: Support --bytes and scaled integers as bandwidth (Peter Krempa) - vsh: Introduce helper to parse --bandwidth (Peter Krempa) - vsh: Refactor vshCommandOptScaledInt (Peter Krempa) - vsh: Tweak error message for scaled integers (Peter Krempa) - qemu: domain: Move and export qemuDomainDiskChainElement(Prepare|Revoke) (Peter Krempa) - qemu: Refactor qemuDomainPrepareDiskChainElement (Peter Krempa) - qemu: Split image access revoking from qemuDomainPrepareDiskChainElement (Peter Krempa) - qemu: Kill qemuDiskPathToAlias (Peter Krempa) - qemu: monitor: Remove JSON impls of drive_add and drive_del (Peter Krempa) - qemu: monitor: Drop qemuMonitorAttachDrive and leaves in call tree (Peter Krempa) - qemu: hotplug: Assume support for -device in qemuDomainAttachSCSIDisk (Peter Krempa) - bhyve: cleanup unnecessary variables (Maxim Nestratov) - virsh: extend domstats command (Qiaowei Ren) - virsh: implement new command to support perf (Qiaowei Ren) - perf: reenable perf events when libvirtd restart (Qiaowei Ren) - perf: add new xml element (Qiaowei Ren) - qemu_driver: add support to perf event (Qiaowei Ren) - perf: implement a set of util functions for perf event (Qiaowei Ren) - perf: implement the remote protocol for perf event (Qiaowei Ren) - perf: add new public APIs for perf event (Qiaowei Ren) - storage: Initialize pool size parameters for refresh thread (Nitesh Konkar) - tests: virtnettlscontexttest: Use virGetLastErrorMessage() (Cole Robinson) - conf: qemu: Add support for more HyperV Enlightenment features (Maxim Nestratov) - conf: refactor hyperv features xml output (Nikolay Shirokovskiy) - conf: refactor hyperv features parsing (Nikolay Shirokovskiy) - tests: storagepoolxml2xmltest: Enable pool-rbd (Anatole Denis) - libxlDomainDetachDeviceLive: handle hostdev parent is network device (Chunyan Liu) - libxlDomainDetachNetDevice: cleanup codes (Chunyan Liu) - libxlDomainAttachNetDevice: release actual deivce and remove hostdev when fail (Chunyan Liu) - network: call proper start/stop functions for macvtap bridge-mode networks (Laine Stump) - qemu: Replace some VIR_ERROR with vir*Error (Jovanka Gulicoska) - qemu: Don't duplicate virGetLastErrorMessage (Jovanka Gulicoska) - nsstest: Drop useless @data check (Michal Privoznik) - virlog: Refactor virLogParseFilters (Erik Skultety) - tests: Add new testcases to test parsing of log filters in virlogtest (Erik Skultety) - gendispatch: Avoid comparing signed and unsigned vars (Michal Privoznik) - event-test: Check for virConnectRegisterCloseCallback return value (Michal Privoznik) - event-test: Use goto cleanup instead of if else jungle (Michal Privoznik) - qemuxml2argvtest: Adapt to ethernet automatic tap creation (Michal Privoznik) - remote: Fix error message (Cole Robinson) - qemuxml2argv: Mock virSCSIDeviceGetSgName (Michal Privoznik) - autocreate tap device for ethernet network type (Vasiliy Tolstov) - tests: hostdev: Add more tests (Andrea Bolognani) - hostdev: Use actual device when reattaching (Andrea Bolognani) - hostdev: Save netdev configuration of actual device (Andrea Bolognani) - hostdev: Streamline device ownership tracking (Andrea Bolognani) - hostdev: Stop early if unmanaged devices have not been detached (Andrea Bolognani) - hostdev: Detect untracked inactive devices (Andrea Bolognani) - qemuxml2argvtest: cleanup test (Pavel Hrdina) - qemuxml2argvtest: use driver.config and priv for qemuDomainSetPrivatePaths (Pavel Hrdina) - qemu_driver: cleanup qemuConnectDomainXMLToNative (Pavel Hrdina) - qemu_process: introduce qemuProcessCreatePretendCmd (Pavel Hrdina) - qemu_process: move qemuDomainSetPrivatePaths to qemuProcessInit (Pavel Hrdina) - qemu_process: move checks to qemuProcessStartValidate (Pavel Hrdina) - qemu: update callers of qemuProcessStartValidate to use virDomainObjPtr (Pavel Hrdina) - qemu_process: introduce qemuProcessPrepareHost (Pavel Hrdina) - qemu_process: introduce qemuProcessPrepareDomain (Pavel Hrdina) - tests: cleanup qemuxml2argvtest (Pavel Hrdina) - nvram: generate it's path in qemuDomainDefPostParse (Pavel Hrdina) - qemu_process: check for correct return value while starting domain (Pavel Hrdina) - qemu-hotplug: fix eject media (Pavel Hrdina) - nss: Make aligning look nicer (Martin Kletzander) - tests: nodedevxml2xml: add test for SCSI target (Bjoern Walk) - conf: node_device: fix up SCSI target (Bjoern Walk) - libxl: support enabling and disabling <hap> feature (Jim Fehlig) - Xen drivers: show hap enabled by default in capabilities (Jim Fehlig) - xenconfig: change 'hap' setting to align with Xen behavior (Jim Fehlig) - conf: add 'state' attribute to <hap> feature (Jim Fehlig) - qemu: Add flags to qemuMigrationWaitForCompletion (Jiri Denemark) - qemu: Refuse to abort migration in post-copy mode (Jiri Denemark) - qemu: Handle post-copy migration failures (Jiri Denemark) - qemu: Refactor qemuProcessRecoverMigration (Jiri Denemark) - virsh: Add --postcopy-after-precopy option to migrate (Cristian Klein) - virsh: Configurable migrate --timeout action (Jiri Denemark) - virsh: Add support for post-copy migration (Cristian Klein) - qemu: Implement virDomainMigrateStartPostCopy (Cristian Klein) - qemu: Add support for VIR_MIGRATE_POSTCOPY flag (Cristian Klein) - qemu: Add QMP functions for post-copy migration (Cristian Klein) - qemu: Handle postcopy-active migration state (Jiri Denemark) - Add public APIs for post-copy migration (Cristian Klein) - Add event and state details for post-copy (Jiri Denemark) - util: Add virSocketAddrSetIPv[46]AddrNetOrder and use it (Martin Kletzander) - qemu: Omit SPICE address if no port is specified (Christophe Fergeau) - qemu: Make all SPICE command-line args optional (Christophe Fergeau) - zfs: Only unencrypted volumes are supported (Richard Laager) - zfs: Only raw volumes are supported (Richard Laager) - logical: Only raw volumes are supported (Richard Laager) - storage: Improve code consistency between backends (Richard Laager) - sheepdog: Use a consistent error message (Richard Laager) - rbd: Use proper error type (Richard Laager) - domain: Add virDomainDefAddImplicitDevices (Cole Robinson) - bhyve: caps: Log error message when CPU init fails (Cole Robinson) - domain: Remove controller/net address whitelists (Cole Robinson) - nodedev: Expose PCI header type (Martin Kletzander) - nodedev: Indent PCI express for future fix (Martin Kletzander) - tests: Introduce nsslinktest (Michal Privoznik) - nss: Introduce a test (Michal Privoznik) - Implement _nss_libvirt_gethostbyname4_r (Michal Privoznik) - nss: Implement _nss_libvirt_gethostbyname3_r (Michal Privoznik) - libvirt.spec.in: Introduce libvirt-nss package (Michal Privoznik) - Initial support for NSS plugin skeleton (Michal Privoznik) - virsocketaddr: Introduce virSocketAddrSetIPv6Addr (Michal Privoznik) - virLeaseReadCustomLeaseFile: Allow server_duid to be NULL (Michal Privoznik) - Export virLease* functions for leases file handling (Michal Privoznik) - tests: add schema test for default cache mode (Jim Fehlig) - tests: add xlconfigdata to domainschematests (Jim Fehlig) - conf: Format disk pool part_separator attribute for running pool (John Ferlan) - qemu: Move last error save/restore to qemuBuildNetCommandLine (John Ferlan) - tests: Set PATH in each test (Michal Privoznik) - Drop paths.h include (Michal Privoznik) - driver: log missing modules as INFO, not WARN (Jovanka Gulicoska) - admin: Add virAdmConnectLookupServer (Martin Kletzander) - qemu: implement setting target disks migration port (Nikolay Shirokovskiy) - migration: add target peer disks port (Nikolay Shirokovskiy) - docs: fix libvirt version for vram64 in formatdomain.html.in (Pavel Hrdina) - vz: code refactoring (Mikhail Feoktistov) - vz: set default SCSI model (Mikhail Feoktistov) - vz: check supported controllers (Mikhail Feoktistov) - vz: report correct disk format in domainGetXMLDesc (Mikhail Feoktistov) - vz: move prlsdkCheckDiskUnsupportedParams to vz_utils.c (Maxim Nestratov) - vz: check supported disk format and bus (Mikhail Feoktistov) - vz: add vzCapabilities to connection structure (Mikhail Feoktistov) - vz: save vz version in connection structure (Mikhail Feoktistov) - virlog: Refactor virLogParseOutputs (Erik Skultety) - virlog: Introduce Type{To,From}String for virLogDestination (Erik Skultety) - tests: Add a new test for logging outputs parser (Erik Skultety) - tests: Slightly tweak virlogtest (Erik Skultety) - nodedev: Shorten match condition (Martin Kletzander) - qemu: Don't overwrite DomainSave errors (Cole Robinson) - qemuDomainRevertToSnapshot: save domain configuration (Dmitry Andreev) - Introduce new VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT sub-event (Dmitry Andreev) - qemu: Introduce qemuBuildPanicCommandLine (John Ferlan) - qemu: Introduce qemuBuildNVRAMCommandLine (John Ferlan) - qemu: Introduce qemuBuildRNGCommandLine (John Ferlan) - qemu: Introduce qemuBuildMemballoonCommandLine (John Ferlan) - qemu: Introduce qemuBuildHostdevCommandLine (John Ferlan) - qemu: Introduce qemuBuildRedirdevCommandLine (John Ferlan) - qemu: Introduce qemuBuildWatchdogCommandLine (John Ferlan) - qemu: Introduce qemuBuildSoundCommandLine (John Ferlan) - hostdev: Add more comments (Andrea Bolognani) - hostdev: Use consistent variable names (Andrea Bolognani) - hostdev: Remove virHostdevGetActivePCIHostDeviceList() (Andrea Bolognani) - schema: support 'default' cache mode (Jim Fehlig) - hostdev: Rename usesVfio -> usesVFIO (Andrea Bolognani) - hostdev: Rename hostdev_mgr -> mgr (Andrea Bolognani) - hostdev: Look up devices using IDs when possible (Andrea Bolognani) - hostdev: Change argument order for virHostdevReattachPCIDevice() (Andrea Bolognani) - hostdev: virHostdevIsPCINetDevice() should return a bool (Andrea Bolognani) - hostdev: Rework resetvfnetconfig loop condition (Andrea Bolognani) - qemu: Introduce qemuBuildVideoCommandLine (John Ferlan) - qemu: Introduce qemuBuildInputCommandLine (John Ferlan) - qemu: Modify qemuBuildTPMCommandLine (John Ferlan) - qemu: Introduce qemuBuildConsoleCommandLine (John Ferlan) - qemu: Introduce qemuBuildChannelsCommandLine (John Ferlan) - qemu: Introduce qemuBuildParallelsCommandLine (John Ferlan) - qemu: Introduce qemuBuildSerialCommandLine (John Ferlan) - qemu: Introduce qemuBuildSmartcardCommandLine (John Ferlan) - gendispatch: Use proper error for limit checking (Martin Kletzander) - virt-admin: Don't tell everyone needlessly we're connected (Martin Kletzander) - remote: Generate what's possible (Martin Kletzander) - gendispatch: Support modern listing of more types (Martin Kletzander) - gendispatch: Remember the name of snapshot variable name (Martin Kletzander) - gendispatch: Accept server as an argument (Martin Kletzander) - admin: Generate ConnectListServers dispatch helpers (Martin Kletzander) - gendispatch: Be able to generate multi-return values (Martin Kletzander) - gendispatch: Cluster, don't capture if not needed (Martin Kletzander) - admin: Be consistent when resetting errors (Martin Kletzander) - admin: Don't use priority for admin APIs (Martin Kletzander) - Change virNetDaemonGetServerNames to virNetDaemonGetServers (Martin Kletzander) - admin: Do not work with virAdm on the server side (Martin Kletzander) - Expose virNetServerGetName (Martin Kletzander) - daemon: Set error for unknown server name (Martin Kletzander) - virerror: Introduce new error type NO_SERVER (Martin Kletzander) - daemon: Get server name from the server itself (Martin Kletzander) - server: Store server name in server object (Martin Kletzander) - admin: Check for flags properly (Martin Kletzander) - admin: Make virAdmServerFree() handle NULL gracefully (Martin Kletzander) - qemu: Introduce qemuBuildNetCommandLine (John Ferlan) - qemu: Introduce qemuBuildFSDevCommandLine (John Ferlan) - qemu: Introduce qemuBuildDiskDriveCommandLine (John Ferlan) - qemu: Introduce qemuBuildHubCommandLine (John Ferlan) - qemu: Introduce qemuBuildControllerDevCommandLine (John Ferlan) - qemu: Introduce qemuBuildGlobalControllerCommandLine (John Ferlan) - qemu: Introduce qemuBuildBootCommandLine (John Ferlan) - qemu: Introduce qemuBuildPMCommandLine (John Ferlan) - qemu: Introduce qemuBuildClockCommandLine (John Ferlan) - qemu: enable debug threads (Marc-André Lureau) - qemu: check for debug-threads capability (Marc-André Lureau) - libxl_conf: reuse virDomainNetGetActualtype in libxlMakeNicList (Chunyan Liu) - logging: support truncation of logfiles when opening (Daniel P. Berrange) - qemu: move functions for handling FD passing (Daniel P. Berrange) - qemu: don't append -chardev arg until after value is formatted (Daniel P. Berrange) - qemu: add support for logging chardev output to a file (Daniel P. Berrange) - conf: allow use of a logfile with chardev backends (Daniel P. Berrange) - logging: allow inode/offset params to be NULL (Daniel P. Berrange) - qemu: Refactor bitmap handling in qemuDomainPinVcpuFlags (Peter Krempa) - qemu: vcpupin: Extract live vcpupin setting into a separate function (Peter Krempa) - util: virfile: Only setuid for virFileRemove if on NFS (Cole Robinson) - util: virfile: Clarify setuid usage for virFileRemove (Cole Robinson) - qemu: add support for offline vcpupin (Peter Krempa) - conf: extract ignoring of inactive vcpu pinning information (Peter Krempa) - conf: refactor checking for unsupported memory devices (Peter Krempa) - conf: introduce parser feature flags (Peter Krempa) - qemu: Report pinning for all vCPUs in qemuDomainGetVcpuPinInfo (Peter Krempa) - conf: Extract code filling data for virDomainGetVcpuPinInfo (Peter Krempa) - virsh: vcpupin: Ask for pinning info for all vCPUs (Peter Krempa) - qemu: Add support for job completed event (Jiri Denemark) - Introduce job completed event (Jiri Denemark) - qemu: Do not report completed stats until the job finishes (Jiri Denemark) - qemu: Don't explicitly stop CPUs after migration (Jiri Denemark) - qemu: Properly update completed migration stats (Jiri Denemark) - qemu: Store completed stats at the very end of migration (Jiri Denemark) - hostdev: Remove explicit NULL checks (Andrea Bolognani) - hostdev: Fix indentation (Andrea Bolognani) - hostdev: Remove inaccurate comment (Andrea Bolognani) - hostdev: Make comments easier to change later (Andrea Bolognani) - tests: hostdev: Group test cases (Andrea Bolognani) - tests: hostdev: Add more checks on list size (Andrea Bolognani) - tests: hostdev: Use size_t for count variables (Andrea Bolognani) - tests: hostdev: Move variable declaration inside CHECK_LIST_COUNT() (Andrea Bolognani) - tests: hostdev: Use better variable names (Andrea Bolognani) - tests: hostdev: Remove magic numbers (Andrea Bolognani) - Add secretObjFromSecret (John Ferlan) - locking: Use bit shift for flag values not constant values. (John Ferlan) - qemu: improve the error when try to undefine transient network (Shanzhi Yu) - libxl: reuse virDomainObjUpdateModificationImpact (Nikolay Shirokovskiy) - lxc: reuse virDomainObjUpdateModificationImpact (Nikolay Shirokovskiy) - libxl: Use virDomainLiveConfigHelperMethod for libxlDomainSetMemoryFlags (Nikolay Shirokovskiy) - Drop inline keyword from some functions. (Michal Privoznik) - Use correct LDFLAGS for leaseshelper (Jiri Denemark) - util: Cleanup error path for virPolkitAgentCreate (John Ferlan) - libxl: Remove extraneous AFFECT_LIVE and not active check. (Nikolay Shirokovskiy) - conf: Combine if condition in virDomainObjUpdateModificationImpact (Nikolay Shirokovskiy) - qemu: enalbe hotplugging of macvtap device with multiqueue (Shanzhi Yu) - Fix formatting in remote_protocol-structs (Jiri Denemark) - Implement handling of per-domain bandwidth settings (Alexander Burluka) - Implement qemuSetupGlobalCpuCgroup (Alexander Burluka) - Add global_period and global_quota XML validation test (Alexander Burluka) - Add error checking on global quota and period (Alexander Burluka) - Add global quota parameter necessary definitions (Alexander Burluka) - Add global period definitions (Alexander Burluka) - vz: implement connection close notification (Nikolay Shirokovskiy) - daemon: add connection close rpc (Nikolay Shirokovskiy) - remote: factor out feature checks on connection open (Nikolay Shirokovskiy) - close callback: move it to driver (Nikolay Shirokovskiy) - virConnectCloseCallbackDataDispose: remove unnecessary locks (Nikolay Shirokovskiy) - close callback API: remove unnecessary locks (Nikolay Shirokovskiy) - virConnectCloseCallbackData: factor out callback disarming (Nikolay Shirokovskiy) - factor out virConnectCloseCallbackDataPtr methods (Nikolay Shirokovskiy) - qemu_cgroup: use virCgroupAddTask instead of virCgroupMoveTask (Henning Schild) - qemu_cgroup: put qemu right into emulator sub-cgroup (Henning Schild) - qemu: process: Move emulator thread setting code into one function (Peter Krempa) - qemu: introduce vram64 attribute for QXL video device (Pavel Hrdina) - qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64 (Pavel Hrdina) - docs/formatdomain: rewrite video documentation (Pavel Hrdina) - domain_conf: always set primary video device as primary (Pavel Hrdina) - virsh: Add support for text based polkit authentication (John Ferlan) - util: Introduce API's for Polkit text authentication (John Ferlan) - polkit: Adjust message when authentication agent isn't found (John Ferlan) - secret: Rename loadSecrets (John Ferlan) - secret: Introduce secretAssignDef (John Ferlan) - secret: Introduce listUnlinkSecret (John Ferlan) - secret: Create a 'base64File' in virSecretObj (John Ferlan) - secret: Create a 'configFile' in virSecretObj (John Ferlan) - secret: Adjust logic to build file path in secretLoad (John Ferlan) - secret: Rename directory to configDir (John Ferlan) - secret: Use 'secret' instead of 's' for variable name (John Ferlan) - secret: Rename virSecretObjPtr 'entry' to 'secret' (John Ferlan) - secret: Remove local virSecretPtr 'secret' (John Ferlan) - secret: Rename virSecretEntry (John Ferlan) - secret: Use virFileRewrite instead of replaceFile (John Ferlan) - secret: Various formatting cleanups (John Ferlan) - vircgroup: one central point for adding tasks to cgroups (Henning Schild) - qemu: Allow setting pinning of emulator/iohtread with automatic placement (Peter Krempa) - qemu: add spice opengl support (Marc-André Lureau) - Post-release version bump to 1.3.3 (Michal Privoznik) - qemu: Shorten per-domain directory names (Martin Kletzander) So thanks a lot for those efforts getting all this in the 1.3.3 release, whether that was contribution on ideas, documentation, patches, reviews, etc. there is a lot packed in this month version ! 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] [PATCH 0/2] boot order storage/parsing cleanup
by Peter Krempa 06 Apr '16

06 Apr '16

Few patches that I have laying around. Peter Krempa (2): conf: Pass the whole device info struct to virDomainDeviceBootParseXML conf: store bootindex as unsigned int src/bhyve/bhyve_command.c | 3 +-- src/conf/domain_conf.c | 19 +++++++++---------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 40 +++++++++++++++++++++------------------- src/qemu/qemu_command.h | 6 +++--- src/qemu/qemu_driver.c | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) -- 2.8.0

2 4

[libvirt] "file '/dev/urandom' is not a supported random source"
by Richard W.M. Jones 05 Apr '16

05 Apr '16

I got this error when trying to use /dev/urandom as a backend for virtio-rng. Is there a reason for that? Plain qemu allows you to specify /dev/urandom and seems to work OK. There's a tetchy bugzilla on this subject: https://bugzilla.redhat.com/show_bug.cgi?id=1074464 but I think for cases where people don't care / throwaway appliances, we should allow /dev/urandom. The main reason is that it doesn't block. Patch attached. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

3 3

[libvirt] [PATCH 0/2] host-validate: Be more careful when checking for cgroups
by Andrea Bolognani 05 Apr '16

05 Apr '16

Basically, the existing code was built around the assumption that no cgroup name could appear as part of the name of another cgroup... Unfortunately, valid cgroup names include 'cpu', 'cpuacct' and 'cpuset'. This series removes the assumption. Cheers. Andrea Bolognani (2): host-validate: Be more careful when checking for cgroup support host-validate: Be more careful when checking for cgroup mounts tools/virt-host-validate-common.c | 67 +++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 14 deletions(-) -- 2.5.5

1 3

[libvirt] [PATCH] docs: fix logfile paragraph
by Boris Fiuczynski 05 Apr '16

05 Apr '16

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 957b839..cab628f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5327,12 +5327,12 @@ qemu-kvm -net nic,model=? /dev/null - Regardless of the<code>type</code>, character devices can + Regardless of the <code>type</code>, character devices can have an optional log file associated with them. This is expressed via a <code>log</code> sub-element, with a <code>file</code> attribute. There can also be a <code>append</code> - attribute which takes teh same values described above. - 1.3.3. + attribute which takes the same values described above. + Since 1.3.3. <pre> -- 2.3.0

2 1

[libvirt] [PATCH] network: Remove extraneous ATTRIBUTE_NONNULL
by John Ferlan 05 Apr '16

05 Apr '16

Commit id '3992ff14' added the prototype for networkGetActualType with 1 parameter, but added 2 ATTRIBUTE_NONNULL's (assume from a cut-n-paste), just remove (2). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial and a build breaker for a coverity build. src/network/bridge_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index f0cac5d..ff7f921 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -48,7 +48,7 @@ int networkGetNetworkAddress(const char *netname, char **netaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int networkGetActualType(virDomainNetDefPtr iface) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); int networkDnsmasqConfContents(virNetworkObjPtr network, const char *pidfile, -- 2.5.5

1 0

[libvirt] Next Generation Config Mgmt + Libvirt
by James 05 Apr '16

05 Apr '16

Dear libvir[t] hackers, ## Intro I'd like to tell you about a project I'm working on, how it pertains to libvirt, and to inspire you about this idea. I thought I'd first give you some quick background about myself... Skip to '## Project' if you'd prefer... I'm James, but I go by purpleidea on a lot of the internet. I've been a happy libvirt user for very many years, and I'm a huge fan of the project. I'm also a Red Hat engineer. I remember using libvirt for both lxc and regular vm's. I even remember being sad when virt-system-service died. I love using both virsh and virt-manager. I think libvirt is such a nice approach, I even went out of my way and hacked on vagrant-libvirt, and Oh-My-Vagrant, since I wanted to use libvirt instead of virtualbox, even though virtualbox was much more popular and apparently easier. ## Project I started a Next Generation Config Mgmt project called "mgmt". Think declarative management similar to puppet and chef, although my system is better because: * it runs in parallel * is event based * functions as a distributed system There's an introductory blog post [2], two other posts [3,4] and a video: https://www.youtube.com/watch?v=GVhpPF0j-iE&html5=1 ## Why Libvirt? The reason this is all very relevant to libvirt, is that since we are event based, a native libvirt "resource" would be a particularly cool and powerful thing to have in mgmt. This would enable a user to declaratively manage libvirt resources, *and* work out automatically how to change and modify the resource when a configuration change happens. This is a highly sought after property. I'd like for mgmt+libvirt to be the first to do this right. Since there haven't been any event based management systems that this would work with, we'd be pioneers. ## Help I don't have enough knowledge of the internals or time to drive creation of this resource. I was hoping one or more of you might be interested in working on this, and or suggesting the project to others. I will of course mentor the developers(s) if they so wish, and help as much as possible. The project is in golang, and so recommendations on how best to communicate with and receive events from libvirtd in golang are welcome. I'm currently considering one of the two libvirt golang bindings that I've found but other ideas are welcome too. ## Thanks Thank you in advance, and please let me know if you're interested. We also have an IRC channel: #mgmtconfig if you'd prefer to talk over IRC. Cheers, James @purpleidea [1] https://ttboj.wordpress.com/?s=vagrant [2] https://ttboj.wordpress.com/2016/01/18/next-generation-configuratio n-mgmt/ [3] https://ttboj.wordpress.com/2016/03/14/automatic-edges-in-mgmt/ [4] https://ttboj.wordpress.com/2016/03/30/automatic-grouping-in-mgmt/

2 1

[libvirt] [PATCH] util: Create virsecret module adding virSecretGetSecretString
by John Ferlan 05 Apr '16

05 Apr '16

Commit id 'fb2bd208' essentially copied the qemuGetSecretString creating an libxlGetSecretString. Rather than have multiple copies of the same code, create virsecret.{c,h} files and place the common function in there. Usage is from both qemu_command.c and libxl_conf.c Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Not for 1.3.3, but I may as well get it "out there" now... po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 3 ++ src/libxl/libxl_conf.c | 82 +++----------------------------- src/qemu/qemu_command.c | 87 ++++------------------------------ src/util/virsecret.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsecret.h | 35 ++++++++++++++ 7 files changed, 174 insertions(+), 155 deletions(-) create mode 100644 src/util/virsecret.c create mode 100644 src/util/virsecret.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 0d7f9f9..e3b8468 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -229,6 +229,7 @@ src/util/virportallocator.c src/util/virprocess.c src/util/virrandom.c src/util/virrotatingfile.c +src/util/virsecret.c src/util/virsexpr.c src/util/virscsi.c src/util/virsocketaddr.c diff --git a/src/Makefile.am b/src/Makefile.am index 1726d06..4783f40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -156,6 +156,7 @@ UTIL_SOURCES = \ util/virrotatingfile.h util/virrotatingfile.c \ util/virscsi.c util/virscsi.h \ util/virseclabel.c util/virseclabel.h \ + util/virsecret.c util/virsecret.h \ util/virsexpr.c util/virsexpr.h \ util/virsocketaddr.h util/virsocketaddr.c \ util/virstats.c util/virstats.h \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 684f06c..fe3d132 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2142,6 +2142,9 @@ virSecurityLabelDefFree; virSecurityLabelDefNew; +# util/virsecret.h +virSecretGetSecretString; + # util/virsexpr.h sexpr2string; sexpr_append; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 82ba417..db26511 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -46,7 +46,7 @@ #include "libxl_conf.h" #include "libxl_utils.h" #include "virstoragefile.h" -#include "base64.h" +#include "virsecret.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -935,76 +935,6 @@ libxlDomainGetEmulatorType(const virDomainDef *def) return ret; } -static char * -libxlGetSecretString(virConnectPtr conn, - const char *scheme, - bool encoded, - virStorageAuthDefPtr authdef, - virSecretUsageType secretUsageType) -{ - size_t secret_size; - virSecretPtr sec = NULL; - char *secret = NULL; - char uuidStr[VIR_UUID_STRING_BUFLEN]; - - /* look up secret */ - switch (authdef->secretType) { - case VIR_STORAGE_SECRET_TYPE_UUID: - sec = virSecretLookupByUUID(conn, authdef->secret.uuid); - virUUIDFormat(authdef->secret.uuid, uuidStr); - break; - case VIR_STORAGE_SECRET_TYPE_USAGE: - sec = virSecretLookupByUsage(conn, secretUsageType, - authdef->secret.usage); - break; - } - - if (!sec) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches uuid '%s'"), - scheme, uuidStr); - } else { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches usage value '%s'"), - scheme, authdef->secret.usage); - } - goto cleanup; - } - - secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); - if (!secret) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using uuid '%s'"), - authdef->username, uuidStr); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using usage value '%s'"), - authdef->username, authdef->secret.usage); - } - goto cleanup; - } - - if (encoded) { - char *base64 = NULL; - - base64_encode_alloc(secret, secret_size, &base64); - VIR_FREE(secret); - if (!base64) { - virReportOOMError(); - goto cleanup; - } - secret = base64; - } - - cleanup: - virObjectUnref(sec); - return secret; -} static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, @@ -1100,11 +1030,11 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) if (!(conn = virConnectOpen("xen:///system"))) goto cleanup; - if (!(secret = libxlGetSecretString(conn, - protocol, - true, - src->auth, - VIR_SECRET_USAGE_TYPE_CEPH))) + if (!(secret = virSecretGetSecretString(conn, + protocol, + true, + src->auth, + VIR_SECRET_USAGE_TYPE_CEPH))) goto cleanup; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2d0ca97..20a5ea4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -50,7 +50,7 @@ #include "secret_conf.h" #include "network/bridge_driver.h" #include "virnetdevtap.h" -#include "base64.h" +#include "virsecret.h" #include "device_conf.h" #include "virstoragefile.h" #include "virtpm.h" @@ -487,77 +487,6 @@ qemuSafeSerialParamValue(const char *value) return 0; } -static char * -qemuGetSecretString(virConnectPtr conn, - const char *scheme, - bool encoded, - virStorageAuthDefPtr authdef, - virSecretUsageType secretUsageType) -{ - size_t secret_size; - virSecretPtr sec = NULL; - char *secret = NULL; - char uuidStr[VIR_UUID_STRING_BUFLEN]; - - /* look up secret */ - switch (authdef->secretType) { - case VIR_STORAGE_SECRET_TYPE_UUID: - sec = virSecretLookupByUUID(conn, authdef->secret.uuid); - virUUIDFormat(authdef->secret.uuid, uuidStr); - break; - case VIR_STORAGE_SECRET_TYPE_USAGE: - sec = virSecretLookupByUsage(conn, secretUsageType, - authdef->secret.usage); - break; - } - - if (!sec) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches uuid '%s'"), - scheme, uuidStr); - } else { - virReportError(VIR_ERR_NO_SECRET, - _("%s no secret matches usage value '%s'"), - scheme, authdef->secret.usage); - } - goto cleanup; - } - - secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); - if (!secret) { - if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using uuid '%s'"), - authdef->username, uuidStr); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get value of the secret for " - "username '%s' using usage value '%s'"), - authdef->username, authdef->secret.usage); - } - goto cleanup; - } - - if (encoded) { - char *base64 = NULL; - - base64_encode_alloc(secret, secret_size, &base64); - VIR_FREE(secret); - if (!base64) { - virReportOOMError(); - goto cleanup; - } - secret = base64; - } - - cleanup: - virObjectUnref(sec); - return secret; -} - static int qemuNetworkDriveGetPort(int protocol, @@ -868,11 +797,11 @@ qemuGetDriveSourceString(virStorageSourcePtr src, secretType = VIR_SECRET_USAGE_TYPE_CEPH; } - if (!(secret = qemuGetSecretString(conn, - protocol, - encode, - src->auth, - secretType))) + if (!(secret = virSecretGetSecretString(conn, + protocol, + encode, + src->auth, + secretType))) goto cleanup; } } @@ -4458,8 +4387,8 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virConnectPtr conn, int secretType = VIR_SECRET_USAGE_TYPE_ISCSI; username = iscsisrc->auth->username; - if (!(secret = qemuGetSecretString(conn, protocol, encode, - iscsisrc->auth, secretType))) + if (!(secret = virSecretGetSecretString(conn, protocol, encode, + iscsisrc->auth, secretType))) goto cleanup; } diff --git a/src/util/virsecret.c b/src/util/virsecret.c new file mode 100644 index 0000000..07c052a --- /dev/null +++ b/src/util/virsecret.c @@ -0,0 +1,120 @@ +/* + * virsecret.c: secret related utility functions + * + * Copyright (C) 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 + * 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/>. + * + */ + +#include <config.h> + +#include "virsecret.h" +#include "viralloc.h" +#include "virerror.h" +#include "virlog.h" +#include "virobject.h" +#include "viruuid.h" +#include "base64.h" +#include "datatypes.h" + +#define VIR_FROM_THIS VIR_FROM_SECRET + +VIR_LOG_INIT("util.secret"); + + +/* virSecretGetSecretString: + * @conn: Pointer to the connection driver to make secret driver call + * @scheme: Unique enough string for error message to help determine cause + * @encoded: Whether the returned secret needs to be base64 encoded + * @authdef: Pointer to the disk storage authentication + * @secretUsageType: Type of secret usage for authdef lookup + * + * Lookup the secret for the authdef usage type and return it either as + * raw text or encoded based on the caller's need. + * + * Returns a pointer to memory that needs to be cleared and free'd after + * usage or NULL on error. + */ +char * +virSecretGetSecretString(virConnectPtr conn, + const char *scheme, + bool encoded, + virStorageAuthDefPtr authdef, + virSecretUsageType secretUsageType) +{ + size_t secret_size; + virSecretPtr sec = NULL; + char *secret = NULL; + char uuidStr[VIR_UUID_STRING_BUFLEN]; + + /* look up secret */ + switch (authdef->secretType) { + case VIR_STORAGE_SECRET_TYPE_UUID: + sec = virSecretLookupByUUID(conn, authdef->secret.uuid); + virUUIDFormat(authdef->secret.uuid, uuidStr); + break; + case VIR_STORAGE_SECRET_TYPE_USAGE: + sec = virSecretLookupByUsage(conn, secretUsageType, + authdef->secret.usage); + break; + } + + if (!sec) { + if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { + virReportError(VIR_ERR_NO_SECRET, + _("%s no secret matches uuid '%s'"), + scheme, uuidStr); + } else { + virReportError(VIR_ERR_NO_SECRET, + _("%s no secret matches usage value '%s'"), + scheme, authdef->secret.usage); + } + goto cleanup; + } + + secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, + VIR_SECRET_GET_VALUE_INTERNAL_CALL); + if (!secret) { + if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("could not get value of the secret for " + "username '%s' using uuid '%s'"), + authdef->username, uuidStr); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("could not get value of the secret for " + "username '%s' using usage value '%s'"), + authdef->username, authdef->secret.usage); + } + goto cleanup; + } + + if (encoded) { + char *base64 = NULL; + + base64_encode_alloc(secret, secret_size, &base64); + VIR_FREE(secret); + if (!base64) { + virReportOOMError(); + goto cleanup; + } + secret = base64; + } + + cleanup: + virObjectUnref(sec); + return secret; +} diff --git a/src/util/virsecret.h b/src/util/virsecret.h new file mode 100644 index 0000000..8ef0629 --- /dev/null +++ b/src/util/virsecret.h @@ -0,0 +1,35 @@ +/* + * virsecret.h: secret related utility functions + * + * Copyright (C) 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 + * 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/>. + * + */ + +#ifndef __VIR_SECRET_H__ +# define __VIR_SECRET_H__ + +# include "internal.h" +# include "virstoragefile.h" + +char *virSecretGetSecretString(virConnectPtr conn, + const char *scheme, + bool encoded, + virStorageAuthDefPtr authdef, + virSecretUsageType secretUsageType) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; +#endif /* __VIR_SECRET_H__ */ -- 2.5.5

2 3

[libvirt] [PATCH for 1.3.3 0/6] Fix a mis-merge
by John Ferlan 05 Apr '16

05 Apr '16

Details in each patch... Depending on whether I get a review before I close my eyes for the night I can push or if reviewed after than and before a release is made - I'm sure someone else can grab and push too... John Ferlan (6): qemu: Fix mis-merge of qemuBuildSmartcardCommandLine qemu: Fix mis-merge of qemuBuildSerialCommandLine qemu: Fix mis-merge of qemuBuildParallelsCommandLine qemu: Fix mis-merge of qemuBuildChannelsCommandLine qemu: Fix mis-merge of qemuBuildConsoleCommandLine qemu: Fix mis-merge of qemuBuildRedirdevCommandLine src/qemu/qemu_command.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.5.5

2 8

[libvirt] Entering freeze for libvirt-1.3.3
by Daniel Veillard 05 Apr '16

05 Apr '16

As suggested yesterday, I tagged RC1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work for me, but please give it some testing ! I expect to have an rc2 on Friday, and do the final release on the week-end or on Monday if everything loks good, Please try it and report, 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 9

[libvirt] Host device assignment driver name vfio/ kvm
by Moshe Levi 04 Apr '16

04 Apr '16

Hi, I was testing Host device assignment in OpenStack environment where the driver name is vfio or kvm. My setup is as follow: 1. Fedora 21 2. Libvirt 1.3.0 which I compiled 3. OpenStack master I have also other setups with older Libvirt version and the same OpenStack environment. I notice that on my fedora environment the driver name is vfio were in my old environment the driver name is kvm. According to Libvirt documentation default is "vfio" on systems where the VFIO driver is available and loaded, see [1] I remove the vfio modules by removing vfio, vfio_iommu_type1, vfio_pci but when I boot a vm the drive name is vfio How can change the driver name to be kvm? Another thing that I encounter is an error when suspending VM (in OpenStack environment) when the driver name is vfio. In such case I am getting the following error from Libvirt: 2016-03-28 11:42:59.527 1966 ERROR oslo_messaging.rpc.dispatcher File "/usr/lib64/python2.7/site-packages/libvirt.py", line 560, in attachDeviceFlags 2016-03-28 11:42:59.527 1966 ERROR oslo_messaging.rpc.dispatcher if ret == -1: raise libvirtError ('virDomainAttachDeviceFlags() failed', dom=self) 2016-03-28 11:42:59.527 1966 ERROR oslo_messaging.rpc.dispatcher libvirtError: internal error: unable to execute QEMU command 'device_add': Device initialization failed. I would appreciate for some pointers on what can cause this issue. [1] https://libvirt.org/formatdomain.html#elementsHostDev

2 6

[libvirt] [PATCH 0/2] Adjust order of calls during qemuDomainRemoveHostDevice
by John Ferlan 04 Apr '16

04 Apr '16

While reviewing patch: http://www.redhat.com/archives/libvir-list/2016-March/msg00194.html I noted that the order of operations during the code path was slightly different and could cause issues if the reattachment code was called first. It would seem that resetting the hostdev label and cgroup prior to reattaching the device to the host would be a better corollary to the attachment code path which detaches the devices from the host, then sets the cgroup, then sets the hostdev label. John Ferlan (2): qemu: Restore label before reattach device to host qemu: Tear down the cgroup before reattach device to host src/qemu/qemu_hotplug.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH for 1.3.3 0/5] Fix parsing our own XMLs
by Martin Kletzander 04 Apr '16

04 Apr '16

Laine found out that he can't do 'virsh nodedev-detach pci_dev' because of some strange error message. That was caused by my commit, but also by all the previous ones that skipped adding tests and parsing of new functions. In order for this to work in 1.3.3, we need either a) only the first patch or b) all of them. I specifically created the first one so that it has enough in itself to fix the problem and we don't need to push more and more patches into the release. We can push the rest after release. If someone wants to have all in for 1.3.3, well, I hope I added enough tests for that ;) Martin Kletzander (5): nodedev: Fix parsing of generated XMLs Change virPCIDeviceAddress to virDevicePCIAddress Move capability formatting together schemas: Update nodedev schema to match reality conf: Parse more of our nodedev XML docs/schemas/nodedev.rng | 29 +++-- src/conf/device_conf.h | 11 +- src/conf/node_device_conf.c | 121 ++++++++++++++++++--- src/conf/node_device_conf.h | 6 +- src/libvirt_private.syms | 10 +- src/network/bridge_driver.c | 4 +- src/node_device/node_device_linux_sysfs.c | 6 +- src/util/virhostdev.c | 12 +- src/util/virnetdev.c | 4 +- src/util/virnetdev.h | 2 +- src/util/virpci.c | 80 +++++++------- src/util/virpci.h | 29 ++--- .../pci_0000_00_1c_0_header_type.xml | 2 +- tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml | 23 ++++ .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 29 +++++ ...i_0000_02_10_7_sriov_pf_vfs_all_header_type.xml | 30 +++++ .../pci_0000_02_10_7_sriov_vfs.xml | 26 +++++ .../pci_0000_02_10_7_sriov_zero_vfs_max_count.xml | 21 ++++ tests/nodedevxml2xmltest.c | 5 + 19 files changed, 333 insertions(+), 117 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml -- 2.8.0

3 10

[libvirt] [PATCH 0/3] fix regression wrt <interface typ='hostdev'>
by Laine Stump 04 Apr '16

04 Apr '16

The full description of the problem fixed by these patches is in patch 3/3. Basically, a recent patch changed the ordering of things during startup such that hostdev interfaces are given an alias named "netN" rather than the expected "hostdevN". That caused a problem when subsequently trying to hotplug another interface of any kind. This is solved by adding a new function that lets us learn the type of any interface prior to setting it up, then using that function to change the behavior when assigning aliases. This *really* should be pushed before 1.3.3 is released. Laine Stump (3): network: new function networkGetActualType qemu: change args to qemuAssignDeviceHostdevAlias() qemu: fix alias name for <interface type='hostdev'> src/network/bridge_driver.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ src/network/bridge_driver.h | 6 +++- src/qemu/qemu_alias.c | 60 +++++++++++++++++++++---------------- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_hotplug.c | 10 +++---- 5 files changed, 118 insertions(+), 32 deletions(-) -- 2.5.5

3 6

[libvirt] [libvirt-perl][PATCH 0/3] Adapt to new virDomain{Get, Set}PerfEvents API
by Michal Privoznik 04 Apr '16

04 Apr '16

It would be nice to have these in before the release. Michal Privoznik (3): Adapt to new virDomain{Get,Set}PerfEvents() gitignore: Add more files to ignore & reorder Add myself to AUTHORS .gitignore | 17 ++++++++++------- AUTHORS | 1 + Changes | 1 + Virt.xs | 38 ++++++++++++++++++++++++++++++++++++++ lib/Sys/Virt/Domain.pm | 32 ++++++++++++++++++++++++++++++++ lib/Sys/Virt/Error.pm | 4 ++++ 6 files changed, 86 insertions(+), 7 deletions(-) -- 2.7.3

2 7

[libvirt] [PATCH for 1.3.3 0/3] qemu: Regenerate per-domain paths on restart
by Martin Kletzander 04 Apr '16

04 Apr '16

We forgot to clean up after the domain is torn down. And because they are kept, we don't regenerate them upn another start and because of that they contain old IDs in them. Again, the series is structured as with the previous one [1]. The smallest part (firs patch only) is enough to fix it for the release, others can be pushed before or after release. That depends on the reviewer. [1] https://www.redhat.com/archives/libvir-list/2016-April/msg00081.html Martin Kletzander (3): qemu: Clear generated private paths qemu: Simplify calls to qemuDomainSetPrivatePaths qemu: Add qemuDomainClearPrivatePaths and use it src/qemu/qemu_domain.c | 40 ++++++++++++++++++++++++++++------------ src/qemu/qemu_domain.h | 10 ++++------ src/qemu/qemu_process.c | 9 +++------ 3 files changed, 35 insertions(+), 24 deletions(-) -- 2.8.0

3 7

[libvirt] [PATCH] apparmor: QEMU monitor socket moved
by Guido Günther 02 Apr '16

02 Apr '16

The directory name changed in a89f05ba8df095875f5ec8a9065a585af63a010b. --- src/security/virt-aa-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index a2d7226..0ded671 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1366,6 +1366,8 @@ main(int argc, char **argv) LOCALSTATEDIR, ctl->def->name); virBufferAsprintf(&buf, " \"%s/lib/libvirt/qemu/domain-%s/monitor.sock\" rw,\n", LOCALSTATEDIR, ctl->def->name); + virBufferAsprintf(&buf, " \"%s/lib/libvirt/qemu/domain-*-%.*s/monitor.sock\" rw,\n", + LOCALSTATEDIR, 20, ctl->def->name); virBufferAsprintf(&buf, " \"%s/run/libvirt/**/%s.pid\" rwk,\n", LOCALSTATEDIR, ctl->def->name); virBufferAsprintf(&buf, " \"/run/libvirt/**/%s.pid\" rwk,\n", -- 2.8.0.rc3

2 4

[libvirt] [PATCH v2 00/10] Introduce worker tuning APIs
by Erik Skultety 01 Apr '16

01 Apr '16

NOTE: patch 2/10 moves typed params definition from libvirt-host.h to libvirt-common.h.in to enable it for admin as well -> therefore libvirt-common.h must be regenerated with config.status - also I'd like to open a discussion about virt-admin commands naming, since I was sort of of out ideas when I copied numatune,memtune,etc. design into "workertune"; I thought about srv-threadpool-info and srv-threadpool-set to be a little consistent with srv-list, but for some reason I found it quite long-ish so I dropped that... v2: - repost of v1 due to rebase conflicts - due to rebase conflicts and overall changes since the original v1 po/POTFILES.in (patch 1/10) had to be updated Erik Skultety (10): 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: 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 | 102 +++++++++++++++++++ daemon/admin_server.c | 112 +++++++++++++++++++++ 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 | 196 ++++++++++++++++++++++++------------ src/util/virthreadpool.h | 8 ++ tools/virt-admin.c | 132 ++++++++++++++++++++++++ 20 files changed, 1073 insertions(+), 254 deletions(-) -- 2.4.3

2 15

[libvirt] [PATCH] Revert "hostdev: Use actual device when reattaching"
by Andrea Bolognani 01 Apr '16

01 Apr '16

This reverts commit ee4cfb56436b50345b072c706b87aff82e06d760. Since we're still not persisting our bookkeeping lists across daemon restarts, we might have lost some information virPCIDeviceReattach() relies on, for example whether the device needs to be unbound from the stub driver. As a result, if the daemon has been restarted in the meantime, the device might end up remaining bound to the stub driver even after 'virsh nodedev-reattach' or similar has been called, with no way of giving it back to the host short of messing with sysfs behind libvirt's back. Revert back to the previous behavior of always trying to bind the device to the host driver, regardless of its status when it was detached, until persistent bookkeeping lists have been implemented. --- src/util/virhostdev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index b397b79..933c942 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1658,7 +1658,6 @@ virHostdevPCINodeDeviceReAttach(virHostdevManagerPtr mgr, virPCIDevicePtr pci) { struct virHostdevIsPCINodeDeviceUsedData data = { mgr, NULL, false }; - virPCIDevicePtr actual; int ret = -1; virObjectLock(mgr->activePCIHostdevs); @@ -1667,12 +1666,11 @@ virHostdevPCINodeDeviceReAttach(virHostdevManagerPtr mgr, if (virHostdevIsPCINodeDeviceUsed(virPCIDeviceGetAddress(pci), &data)) goto cleanup; - /* We need to look up the actual device because that's what - * virPCIDeviceReattach() expects as its argument */ - if (!(actual = virPCIDeviceListFind(mgr->inactivePCIHostdevs, pci))) - goto cleanup; + virPCIDeviceSetUnbindFromStub(pci, true); + virPCIDeviceSetRemoveSlot(pci, true); + virPCIDeviceSetReprobe(pci, true); - if (virPCIDeviceReattach(actual, mgr->activePCIHostdevs, + if (virPCIDeviceReattach(pci, mgr->activePCIHostdevs, mgr->inactivePCIHostdevs) < 0) goto cleanup; -- 2.5.5

2 2

[libvirt] [PATCH 0/4] Add support for an XKCD mode
by Daniel P. Berrange 01 Apr '16

01 Apr '16

The XKCD website primarily publishes comics, but many of them are in fact design blueprints showing best practice for software developers. A number of these designs are applicable to libvirt and will provide valuable features to our users. This series introduces a new framework for enabling these enhanced features via a so called "XKCD mode". They are not enabled by default since we want to retain backwards compatibility for existing users. Users of libvirt though are encouraged to enable as many of the features as possible for their deployments. Daniel P. Berrange (4): xkcd: add initial framework to enabling XKCD mode xkcd: enable more efficient random number generator xkcd: enabling pre-processing of XML with perl xkcd: generate secure rememberable qcow2 passwords src/Makefile.am | 2 + src/libvirt_private.syms | 4 ++ src/util/virrandom.c | 26 ++++++++----- src/util/virstorageencryption.c | 47 ++++++++++++---------- src/util/virxkcd.c | 86 +++++++++++++++++++++++++++++++++++++++++ src/util/virxkcd.h | 31 +++++++++++++++ src/util/virxml.c | 35 ++++++++++++++--- 7 files changed, 194 insertions(+), 37 deletions(-) create mode 100644 src/util/virxkcd.c create mode 100644 src/util/virxkcd.h -- 2.5.5

6 9

[libvirt] [PATCH] docs: Remove useless p:first-line CSS rule
by Andrea Bolognani 01 Apr '16

01 Apr '16

According to MDN[1], the 'margin-left' CSS property cannot be applied to the '::first-line' pseudo-element, so this rule will never have any effect and can be safely removed. [1] https://developer.mozilla.org/en/docs/Web/CSS/::first-line --- docs/generic.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/generic.css b/docs/generic.css index 4f98b26..208e31e 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -7,10 +7,6 @@ body { background: #ffffff; } -p:first-line { - margin-right: 1em; -} - p, ul, ol, dl { padding: 0px; margin: 0px; -- 2.5.5

2 4

[libvirt] [PATCH 00/11] vz: change vz driver to be stateful driver and other enhancements
by Maxim Nestratov 01 Apr '16

01 Apr '16

There is no benefit in providing two ways of connecting to vz driver: by connecting via daemon and directly from client. Both ways finally come to a host where vz daemon sits. Always connecting via daemon allows us to have a single list of domains and share it among all connections. Maxim Nestratov (11): virsh: report when vz driver is compiled vz: change the order of capabilities reported vz: remove drivername field from vzConn structure vz: build driver as module and don't register it on client's side vz: pass vzConnPtr to prlsdkXxx functions instead of virConnectPtr vz: make vzConn structure be a new lockable object and use it vz: implement connectGetSysinfo hypervisor callback vz: remove close callback implementations vz: remove vzDriverLock/Unlock function vz: minor cleanup vz: change vzConnectIsAlive behavior daemon/Makefile.am | 4 + daemon/libvirtd.c | 9 + src/Makefile.am | 21 ++- src/libvirt.c | 7 - src/vz/vz_driver.c | 479 ++++++++++++++++++++++++++++++----------------------- src/vz/vz_sdk.c | 36 ++-- src/vz/vz_sdk.h | 6 +- src/vz/vz_utils.c | 18 +- src/vz/vz_utils.h | 15 +- tools/virsh.c | 3 + 10 files changed, 341 insertions(+), 257 deletions(-) -- 2.4.3

2 16

[libvirt] [PATCH perl] Add APIS & constants for new perf event support
by Daniel P. Berrange 01 Apr '16

01 Apr '16

Add binding for virDomainGetPerfEvents, virDomainSetPerfEvents, VIR_DOMAIN_STATS_PERF, VIR_PERF_PARAM_CMT, and VIR_FROM_PERF Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changes | 1 + Virt.xs | 43 +++++++++++++++++++++++++++++++++++++++++++ lib/Sys/Virt/Domain.pm | 34 ++++++++++++++++++++++++++++++++++ lib/Sys/Virt/Error.pm | 4 ++++ 4 files changed, 82 insertions(+) diff --git a/Changes b/Changes index 2f86a3d..8e08e3e 100644 --- a/Changes +++ b/Changes @@ -12,6 +12,7 @@ Revision history for perl module Sys::Virt - Add VIR_MIGRATE_PARAM_DISKS_PORT constant - Add virDomainMigrateStartPostCopy API support - Add constants related to post-copy migration + - Add APIS & constants for new perf event support 1.3.2 2016-03-01 diff --git a/Virt.xs b/Virt.xs index 3664521..50ed6cd 100644 --- a/Virt.xs +++ b/Virt.xs @@ -4213,6 +4213,46 @@ set_blkio_parameters(dom, newparams, flags=0) Safefree(params); +HV * +get_perf_events(dom, flags=0) + virDomainPtr dom; + unsigned int flags; + PREINIT: + virTypedParameter *params = NULL; + int nparams = 0; + CODE: + if (virDomainGetPerfEvents(dom, &params, &nparams, flags) < 0) { + Safefree(params); + _croak_error(); + } + + RETVAL = vir_typed_param_to_hv(params, nparams); + Safefree(params); + OUTPUT: + RETVAL + + +void +set_perf_events(dom, newparams, flags=0) + virDomainPtr dom; + HV *newparams; + unsigned int flags; + PREINIT: + virTypedParameter *params = NULL; + int nparams = 0; + PPCODE: + if (virDomainGetPerfEvents(dom, &params, &nparams, flags) < 0) { + Safefree(params); + _croak_error(); + } + + nparams = vir_typed_param_from_hv(newparams, params, nparams); + + if (virDomainSetPerfEvents(dom, params, nparams, flags) < 0) + _croak_error(); + Safefree(params); + + unsigned long get_max_memory(dom) virDomainPtr dom; @@ -7641,6 +7681,7 @@ BOOT: REGISTER_CONSTANT(VIR_DOMAIN_STATS_INTERFACE, STATS_INTERFACE); REGISTER_CONSTANT(VIR_DOMAIN_STATS_STATE, STATS_STATE); REGISTER_CONSTANT(VIR_DOMAIN_STATS_VCPU, STATS_VCPU); + REGISTER_CONSTANT(VIR_DOMAIN_STATS_PERF, STATS_PERF); REGISTER_CONSTANT(VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE, GET_ALL_STATS_ACTIVE); REGISTER_CONSTANT(VIR_CONNECT_GET_ALL_DOMAINS_STATS_INACTIVE, GET_ALL_STATS_INACTIVE); @@ -7905,6 +7946,7 @@ BOOT: REGISTER_CONSTANT(VIR_DOMAIN_NUMATUNE_MEM_PREFERRED, NUMATUNE_MEM_PREFERRED); REGISTER_CONSTANT(VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE, NUMATUNE_MEM_INTERLEAVE); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_CMT, PERF_PARAM_CMT); REGISTER_CONSTANT_STR(VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, BANDWIDTH_IN_AVERAGE); REGISTER_CONSTANT_STR(VIR_DOMAIN_BANDWIDTH_IN_PEAK, BANDWIDTH_IN_PEAK); @@ -8368,6 +8410,7 @@ BOOT: REGISTER_CONSTANT(VIR_FROM_ADMIN, FROM_ADMIN); REGISTER_CONSTANT(VIR_FROM_LOGGING, FROM_LOGGING); REGISTER_CONSTANT(VIR_FROM_XENXL, FROM_XENXL); + REGISTER_CONSTANT(VIR_FROM_PERF, FROM_PERF); REGISTER_CONSTANT(VIR_ERR_OK, ERR_OK); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index 26ead9b..b095dbd 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -812,6 +812,23 @@ of the NUMA PARAMETERS constants. The C<$flags> parameter accepts one or more the CONFIG OPTION constants documented later, and defaults to 0 if omitted. +=item my $params = $dom->get_perf_events($flags=0) + +Return a hash reference containing the set of performance +events that are available for the guest. The keys in the +hash are one of the constants PERF EVENTS described later. +The C<$flags> parameter accepts one or more the CONFIG +OPTION constants documented later, and defaults to 0 if +omitted. + +=item $dom->set_perf_events($params, $flags=0) + +Update the enabled state for performance events for the +guest. The C<$params> should be a hash reference whose +keys are one of the PERF EVENTS constants. The C<$flags> +parameter accepts one or more the CONFIG OPTION constants +documented later, and defaults to 0 if omitted. + =item $dom->block_resize($disk, $newsize, $flags=0) Resize the disk C<$disk> to have new size C<$newsize> KB. If the disk @@ -2588,6 +2605,19 @@ The burstable outbound bandwidth =back +=head2 PERF EVENTS + +The following constants defined performance events +which can be monitored for a guest + +=over 4 + +=item Sys::Virt::Domain::PERF_PARAM_CMT + +The CMT event counter + +=back + =head2 VCPU FLAGS The following constants are useful when getting/setting the @@ -3716,6 +3746,10 @@ General lifecycle state Virtual CPU info +=item Sys::Virt::Domain::STATS_PERF + +Performance event counter values + =back =head2 PROCESS SIGNALS diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index 3f6b058..b54f876 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -394,6 +394,10 @@ The logging service The Xen XL driver +=item Sys::Virt::Error::FROM_PERF + +The performance events subsystem + =back =head2 ERROR CODE CONSTANTS -- 2.5.5

1 0

[libvirt] [PATCH] docs: Remove unused CSS rule
by Andrea Bolognani 01 Apr '16

01 Apr '16

Commit e14c5069c512 dropped the only user of the #sponsor CSS rule, so we can drop it from the stylesheet as well. --- docs/libvirt.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index c6f6d0d..2310b20 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -300,12 +300,6 @@ p.image { color: #ccc; } -#sponsor { - color: #757575; - text-decoration: inherit; - font-size: 1.2em; -} - span.since { color: #3c857c; font-style: italic; -- 2.5.5

2 2

[libvirt] [PATCH] Pass the correct cpu count when calling virDomainGetCPUStats.
by Nitesh Konkar 01 Apr '16

01 Apr '16

When using the --start option, the show_count should not be set to max_id as the --start <cpu> means we dont need those many inital cpu stats. Hence, show_count should be adjusted accordingly. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Before Patch: virsh cpu-stats --domain 24 --start 158 CPU158: cpu_time 0.073570788 seconds vcpu_time 0.033277032 seconds CPU159: cpu_time 0.000000000 seconds vcpu_time 0.000000000 seconds error: Failed to retrieve CPU statistics for domain 24 error: invalid argument: start_cpu 280 larger than maximum of 159 After Patch: virsh cpu-stats --domain 24 --start 158 CPU158: cpu_time 0.073570788 seconds vcpu_time 0.033277032 seconds CPU159: cpu_time 0.000000000 seconds vcpu_time 0.000000000 seconds tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bb1ee1c..7599bdc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7331,7 +7331,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) if (show_count < 0 || show_count > max_id) { if (show_count > max_id) vshPrint(ctl, _("Only %d CPUs available to show\n"), max_id); - show_count = max_id; + show_count = max_id - cpu; } /* get percpu information */ -- 1.8.3.1

2 1

[libvirt] [PATCH v2] migration: convert speed from Mb/sec to bytes/sec in drive-mirror jobs
by Rudy Zhang 01 Apr '16

01 Apr '16

Commit id '7b7600b3' added qemuMigrationDriveMirror to handle NBD mirroring, but passed the migrate_speed listed in MiB/s to be used for the mirror_speed which expects a bytes/s value. This patch will convert the migrate_speed value to its mirror_speed equivalent. Signed-off-by: Rudy Zhang <rudyflyzhang(a)gmail.com> --- src/qemu/qemu_migration.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8bc76bf..3d9a55f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2093,12 +2093,21 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, char *diskAlias = NULL; char *nbd_dest = NULL; char *hoststr = NULL; + unsigned long long mirror_speed = speed; unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; int rv; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); + if (mirror_speed > LLONG_MAX >> 20) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + LLONG_MAX >> 20); + return ret; + } + mirror_speed <<= 20; + /* steal NBD port and thus prevent its propagation back to destination */ port = mig->nbd->port; mig->nbd->port = 0; @@ -2136,7 +2145,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, qemuBlockJobSyncBegin(disk); /* Force "raw" format for NBD export */ mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, - "raw", speed, 0, 0, mirror_flags); + "raw", mirror_speed, 0, 0, mirror_flags); VIR_FREE(diskAlias); VIR_FREE(nbd_dest); -- 2.6.4

2 1

[libvirt] [PATCH 00/38] Introduce APIs to change daemon's logging settings
by Erik Skultety 01 Apr '16

01 Apr '16

This series implements administration APIs to modify daemon's logging settings which include priority, filters, and outputs. It also performs all necessary changes to enable this feature. Patches also involve some slight refactors to the existing code as well as wiring up the APIs to virt-admin client. The major change in internal code is how definition of filters and outputs is achieved. Until now each filter/output has been defined and appended to the global set of filters/outputs individually whilst holding a lock that was repeatedly released after each filter/output. If modification to filters and outputs should be exported through public APIs, all these setter operations must be atomic, i.e. accomplished as a unit, not gradually. For filters and priority, these are replaced normally, i.e. reset the original and replace it with the new copy while having the lock. For outputs, there was a slight issue, since resetting the global set of outputs would result in closing all the file descriptors, which might not be exactly what we want, since the new set of outputs that is meant to replace the original set might include outputs that are also contained within the original set. The logic for such outputs is following: Each file-based output that already exists in the original set and should continue existing in the new set will copy the existing FD from the global set. For each syslog-based output, closelog and openlog must be called anyway (because syslog keeps its FD private), but will be called at the very last moment if such an output already exists to prevent from changing before the lock for unit replaced is acquired, and thus breaking the atomicity that we want. For journald-based outputs, the FD is global, we just need to prevent it from being closed if such an output shall continue to exist. All outputs that need to continue to exist are prevented from closing when being destroyed-deallocated. On the other hand, all outputs that do not exist in the new set of outputs shall be closed correctly. Erik Skultety (38): virlog: Return void instead of int in virLogReset<Foo> methods virlog: Convert virLogOutputs to a list of pointers to outputs virlog: Convert virLogFilters to a list of pointers to filters virlog: Export virLogOutputPtr through header virlog: Export virLogFilterPtr through header virlog: Introduce virLogSetFilters virlog: Introduce virLogSetOutputs daemon: Replace virLogParseOutputs with virLogSetOutputs in callers daemon: Replace virLogParseFilters with virLogSetFilters in callers virlog: Introduce virLogDefineOutputs virlog: Introduce virLogDefineFilters virlog: Rename virLogAddOutputTo to virLogNewOutput virlog: Rename virLogDefineOutput to virLogOutputNew virlog: Rename virLogDefineFilter to virLogFilterNew virlog: Introduce virLogOutputFree virlog: Introduce virLogOutputListFree virlog: Introduce virLogFilterFree virlog: Introduce virLogFilterListFree virlog: Make virLogReset methods use of virLog(Output|Filter)ListFree virlog: Split output parsing and output defining to separate operations virlog: Split filter parsing and filter defining to separate operations virlog: Split parsing and setting priority virlog: Introduce virLogOutputExists virlog: Make use of virLogOutputExists virlog: Take a special care of syslog when setting new set of log outputs virlog: Swap the new copy of outputs with the global existing one virlog: Rename virLogFiltersSerial to virLogSerial virlog: Make virLogSetDefaultPriority trigger source update as well virlog: Introduce an API mutex that serializes all setters virlog: Acquire virLogAPILock in each setter API admin: Introduce virAdmConnectGetLoggingLevel admin: Introduce virAdmConnectGetLoggingFilters admin: Introduce virAdmConnectGetLoggingOutputs admin: Introduce virAdmConnectSetLoggingLevel admin: Introduce virAdmConnectSetLoggingFilters admin: Introduce virAdmConnectSetLoggingOutputs admin: Export logging level constants via libvirt-admin.h virt-admin: Wire-up the logging APIs daemon/admin.c | 125 +++++++ daemon/libvirtd.c | 8 +- include/libvirt/libvirt-admin.h | 37 +++ src/admin/admin_protocol.x | 73 ++++- src/admin/admin_remote.c | 86 +++++ src/admin_protocol-structs | 38 +++ src/libvirt-admin.c | 219 +++++++++++++ src/libvirt_admin_private.syms | 9 + src/libvirt_admin_public.syms | 6 + src/libvirt_private.syms | 14 +- src/locking/lock_daemon.c | 8 +- src/logging/log_daemon.c | 8 +- src/util/virlog.c | 698 +++++++++++++++++++++++++++------------- src/util/virlog.h | 50 +-- tests/eventtest.c | 3 +- tests/testutils.c | 19 +- tests/virlogtest.c | 12 +- tools/virt-admin.c | 208 ++++++++++++ 18 files changed, 1361 insertions(+), 260 deletions(-) -- 2.4.3

2 43

[libvirt] [PATCH 0/5] Make all crashes non CVEs
by Michal Privoznik 01 Apr '16

01 Apr '16

Currently, whenever a crash occurs it may be very serious. It may even get its own CVE. This patch set tries to resolve the problem. Michal Privoznik (5): Introduce virConnectCrash virutil: Introduce virCrash remote: Implement virConnectCrash qemu: Implement virConnectCrash virsh: Implement virConnectCrash cfg.mk | 2 ++ daemon/remote.c | 30 +++++++++++++++++ include/libvirt/libvirt-host.h | 15 +++++++++ src/driver-hypervisor.h | 7 ++++ src/libvirt-host.c | 45 +++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 29 ++++++++++++++++ src/remote/remote_driver.c | 32 ++++++++++++++++++ src/remote/remote_protocol.x | 14 +++++++- src/remote_protocol-structs | 5 +++ src/util/virutil.c | 32 ++++++++++++++++++ src/util/virutil.h | 2 ++ tools/virsh-host.c | 75 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 9 +++++ 15 files changed, 298 insertions(+), 1 deletion(-) -- 2.7.3

3 7

[libvirt] [PATCH] qemu: perf: Tweak flags before using them
by Peter Krempa 01 Apr '16

01 Apr '16

@flags have a valid modification impact only after calling virDomainObjUpdateModificationImpact. virDomainObjGetOneDef calls it but doesn't update them in the caller. --- CC: mprivozn(a)redhat.com src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4aa1625..0434438 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10150,6 +10150,9 @@ qemuDomainGetPerfEvents(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) + goto endjob; + if (!(def = virDomainObjGetOneDef(vm, flags))) goto endjob; -- 2.8.0

2 2

[libvirt] [PATCH] migration: convert speed from Mb/sec to bytes/sec in drive-mirror jobs
by Rudy Zhang 01 Apr '16

01 Apr '16

Commit id '7b7600b3' added qemuMigrationDriveMirror to handle NBD mirroring, but passed the migrate_speed listed in MiB/s to be used for the mirror_speed which expects a bytes/s value. This patch will convert the migrate_speed value to its mirror_speed equivalent. Signed-off-by: Rudy Zhang <rudyflyzhang(a)gmail.com> --- src/qemu/qemu_migration.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8bc76bf..3d9a55f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2093,12 +2093,21 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, char *diskAlias = NULL; char *nbd_dest = NULL; char *hoststr = NULL; + unsigned long long mirror_speed = speed; unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; int rv; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); + if (mirror_speed > LLONG_MAX >> 20) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + LLONG_MAX >> 20); + return ret; + } + mirror_speed <<= 20; + /* steal NBD port and thus prevent its propagation back to destination */ port = mig->nbd->port; mig->nbd->port = 0; @@ -2136,7 +2145,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, qemuBlockJobSyncBegin(disk); /* Force "raw" format for NBD export */ mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, - "raw", speed, 0, 0, mirror_flags); + "raw", mirror_speed, 0, 0, mirror_flags); VIR_FREE(diskAlias); VIR_FREE(nbd_dest); -- 2.6.4

1 0

[libvirt] [PATCH] migration: convert speed from Mb/sec to bytes/sec in drive-mirror jobs
by Rudy Zhang 01 Apr '16

01 Apr '16

Block migration speed is differect from memory migration speed, because it not convert speed from Mb/sec to bytes/sec in the drive-mirror job. Signed-off-by: Rudy Zhang <rudyflyzhang(a)gmail.com> --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8bc76bf..7648d8c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2135,8 +2135,8 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, qemuBlockJobSyncBegin(disk); /* Force "raw" format for NBD export */ - mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, - "raw", speed, 0, 0, mirror_flags); + mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest,"raw", + (unsigned long long)speed << 20, 0, 0, mirror_flags); VIR_FREE(diskAlias); VIR_FREE(nbd_dest); -- 2.6.4

3 3

[libvirt] [PATCH 1/1] python: add python binding for Perf API
by Qiaowei Ren 01 Apr '16

01 Apr '16

This patch adds the python binding for virDomainSetPerfEvents and virDomainSetPerfEvents API. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- generator.py | 2 ++ libvirt-override-api.xml | 11 ++++++ libvirt-override.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/generator.py b/generator.py index d9ae17e..fb6a493 100755 --- a/generator.py +++ b/generator.py @@ -433,6 +433,8 @@ skip_impl = ( 'virDomainGetMemoryParameters', 'virDomainSetNumaParameters', 'virDomainGetNumaParameters', + 'virDomainSetPerfEvents', + 'virDomainGetPerfEvents', 'virDomainGetVcpus', 'virDomainPinVcpu', 'virDomainPinVcpuFlags', diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 1a0e314..54b45f7 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -344,6 +344,17 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetPerfEvents' file='python'> + <info>Enable or disable the particular list of perf events</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to perf events parameter object'/> + </function> + <function name='virDomainGetPerfEvents' file='python'> + <info>Get all perf events setting.</info> + <return type='char *' info='returns a dictionary of params in case of success, None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + </function> <function name='virDomainSetInterfaceParameters' file='python'> <info>Change the bandwidth tunables for a interface device</info> <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> diff --git a/libvirt-override.c b/libvirt-override.c index ce36280..11ef15e 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -1059,6 +1059,97 @@ libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetPerfEvents(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + Py_ssize_t size = 0; + virTypedParameterPtr params = NULL, new_params = NULL; + + if (!PyArg_ParseTuple(args, + (char *)"OO:virDomainSetNumaParameters", + &pyobj_domain, &info)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetPerfEvents(domain, &params, &nparams); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetPerfEvents(domain, new_params, size); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + ret = VIR_PY_INT_SUCCESS; + + cleanup: + virTypedParamsFree(params, nparams); + virTypedParamsFree(new_params, size); + return ret; +} + +static PyObject * +libvirt_virDomainGetPerfEvents(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_domain; + virDomainPtr domain; + virTypedParameterPtr params = NULL; + int nparams = 0; + PyObject *dict = NULL; + int rc; + + if (!PyArg_ParseTuple(args, (char *) "O:virDomainGetPerfEvents", + &pyobj_domain)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + rc = virDomainGetPerfEvents(domain, &params, &nparams); + LIBVIRT_END_ALLOW_THREADS; + if (rc < 0) + return VIR_PY_NONE; + + if (!(dict = getPyVirTypedParameter(params, nparams))) + goto cleanup; + + cleanup: + virTypedParamsFree(params, nparams); + return dict; +} + +static PyObject * libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { @@ -8686,6 +8777,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetPerfEvents", libvirt_virDomainSetPerfEvents, METH_VARARGS, NULL}, + {(char *) "virDomainGetPerfEvents", libvirt_virDomainGetPerfEvents, METH_VARARGS, NULL}, {(char *) "virDomainSetInterfaceParameters", libvirt_virDomainSetInterfaceParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetInterfaceParameters", libvirt_virDomainGetInterfaceParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, -- 1.9.1

3 3

[libvirt] [PATCH] allow ip and route elements for netdev ethernet
by Vasiliy Tolstov 01 Apr '16

01 Apr '16

This is next part of network type ethernet patches, that adds ability to assign ip address and routes to tap devices for qemu driver like done before for lxc. Vasiliy Tolstov (1): allow ip and route elements for netdev ethernet docs/formatdomain.html.in | 12 ++++++++- docs/schemas/network.rng | 3 +++ include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 14 ++++++++++- src/conf/domain_conf.h | 1 + src/conf/network_conf.c | 26 ++++++++++++++++++- src/conf/network_conf.h | 1 + src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_interface.c | 39 +++++++++++++++++++++++++++++ src/util/virnetdev.c | 54 ++++++++++++++++++++++++++++------------ src/util/virnetdev.h | 1 + 12 files changed, 135 insertions(+), 21 deletions(-) -- 2.7.3

2 2

[libvirt] netdev ethernet allow to specify ip address and routes
by Vasiliy Tolstov 01 Apr '16

01 Apr '16

Allow to use ip address and routes elements inside netowrk type='ethernet'. Also add ability to create point to point device addresses. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- docs/schemas/interface.rng | 6 +++++ include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 14 ++++++++++- src/conf/domain_conf.h | 1 + src/conf/network_conf.c | 26 ++++++++++++++++++- src/conf/network_conf.h | 1 + src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_interface.c | 39 +++++++++++++++++++++++++++++ src/util/virnetdev.c | 54 ++++++++++++++++++++++++++++------------ src/util/virnetdev.h | 1 + 11 files changed, 127 insertions(+), 20 deletions(-) diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index 052703ce84aa..b81c38b9d07c 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -332,6 +332,9 @@ <optional> <attribute name="prefix"><ref name="ipv4Prefix"/></attribute> </optional> + <optional> + <attribute name="peer"><ref name="ipv4Addr"/></attribute> + </optional> </element> </zeroOrMore> <optional> @@ -361,6 +364,9 @@ <optional> <attribute name="prefix"><ref name="ipv6Prefix"/></attribute> </optional> + <optional> + <attribute name="peer"><ref name="ipv6Addr"/></attribute> + </optional> </element> </zeroOrMore> <optional> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7e06796c3c73..437e87fac01c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3937,6 +3937,7 @@ typedef virDomainIPAddress *virDomainIPAddressPtr; struct _virDomainInterfaceIPAddress { int type; /* virIPAddrType */ char *addr; /* IP address */ + char *peer; /* IP peer */ unsigned int prefix; /* IP address prefix */ }; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d5d9ff702f42..34855233ad15 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5725,7 +5725,7 @@ virDomainNetIpParseXML(xmlNodePtr node) unsigned int prefixValue = 0; char *familyStr = NULL; int family = AF_UNSPEC; - char *address = NULL; + char *address = NULL, *peer = NULL; if (!(prefixStr = virXMLPropString(node, "prefix")) || (virStrToLong_ui(prefixStr, NULL, 10, &prefixValue) < 0)) { @@ -5739,6 +5739,9 @@ virDomainNetIpParseXML(xmlNodePtr node) goto cleanup; } + if ((peer = virXMLPropString(node, "peer")) == NULL) + VIR_DEBUG("Peer is empty"); + familyStr = virXMLPropString(node, "family"); if (familyStr && STREQ(familyStr, "ipv4")) family = AF_INET; @@ -5756,6 +5759,14 @@ virDomainNetIpParseXML(xmlNodePtr node) address); goto cleanup; } + + if ((peer != NULL) && (virSocketAddrParse(&ip->peer, peer, family) < 0)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Failed to parse IP address: '%s'"), + peer); + goto cleanup; + } + ip->prefix = prefixValue; ret = ip; @@ -5765,6 +5776,7 @@ virDomainNetIpParseXML(xmlNodePtr node) VIR_FREE(prefixStr); VIR_FREE(familyStr); VIR_FREE(address); + VIR_FREE(peer); VIR_FREE(ip); return ret; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 83bdd67dec45..040882ec8460 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -513,6 +513,7 @@ typedef struct _virDomainNetIpDef virDomainNetIpDef; typedef virDomainNetIpDef *virDomainNetIpDefPtr; struct _virDomainNetIpDef { virSocketAddr address; /* ipv4 or ipv6 address */ + virSocketAddr peer; /* ipv4 or ipv6 address of peer */ unsigned int prefix; /* number of 1 bits in the net mask */ }; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4fb2e2a75b9d..1a0cf7fdcdd2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1456,7 +1456,7 @@ virNetworkIPDefParseXML(const char *networkName, */ xmlNodePtr cur, save; - char *address = NULL, *netmask = NULL; + char *address = NULL, *netmask = NULL, *peer = NULL; unsigned long prefix = 0; int prefixRc; int result = -1; @@ -1502,6 +1502,14 @@ virNetworkIPDefParseXML(const char *networkName, else def->prefix = prefix; + peer = virXPathString("string(./@peer)", ctxt); + if (peer && (virSocketAddrParse(&def->peer, peer, AF_UNSPEC) < 0)) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid peer '%s' in network '%s'"), + peer, networkName); + goto cleanup; + } + /* validate address, etc. for each family */ if ((def->family == NULL) || (STREQ(def->family, "ipv4"))) { if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || @@ -1531,6 +1539,14 @@ virNetworkIPDefParseXML(const char *networkName, prefix, networkName); goto cleanup; } + if (peer) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->peer, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"), + peer, networkName); + goto cleanup; + } + } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1550,6 +1566,14 @@ virNetworkIPDefParseXML(const char *networkName, prefix, networkName); goto cleanup; } + if (peer) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->peer, AF_INET6)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"), + peer, networkName); + goto cleanup; + } + } } else { virReportError(VIR_ERR_XML_ERROR, _("Unrecognized family '%s' in network '%s'"), diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index b72257b970a8..9b8e807fda3c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -152,6 +152,7 @@ struct _virNetworkIpDef { */ unsigned int prefix; /* ipv6 - only prefix allowed */ virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ + virSocketAddr peer; /* ipv4 or ipv6 peer address */ size_t nranges; /* Zero or more dhcp ranges */ virSocketAddrRangePtr ranges; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 348bbfbc01fc..a1deb0c00d4c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -520,7 +520,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_DEBUG("Adding IP address '%s/%u' to '%s'", ipStr, ip->prefix, newname); - if (virNetDevSetIPAddress(newname, &ip->address, prefix) < 0) { + if (virNetDevSetIPAddress(newname, &ip->address, &ip->peer, prefix) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to set IP address '%s' on %s"), ipStr, newname); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a09a7e474fc5..f3ff88ff55a6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1970,7 +1970,7 @@ networkAddAddrToBridge(virNetworkObjPtr network, } if (virNetDevSetIPAddress(network->def->bridge, - &ipdef->address, prefix) < 0) + &ipdef->address, &ipdef->peer, prefix) < 0) return -1; return 0; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 13a513152876..5729325fadb9 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -474,6 +474,45 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, if (virNetDevSetMAC(net->ifname, &tapmac) < 0) goto cleanup; + for (j = 0; j < net->nips; j++) { + virDomainNetIpDefPtr ip = net->ips[j]; + unsigned int prefix = (ip->prefix > 0) ? ip->prefix : + VIR_SOCKET_ADDR_DEFAULT_PREFIX; + char *ipStr = virSocketAddrFormat(&ip->address); + + VIR_DEBUG("Adding IP address '%s/%u' to '%s'", + ipStr, ip->prefix, net->ifname); + + if (virNetDevSetIPAddress(net->ifname, &ip->address, &ip->peer, prefix) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to set IP address '%s' on %s"), + ipStr, net->ifname); + VIR_FREE(ipStr); + goto cleanup; + } + VIR_FREE(ipStr); + } + + if (net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP || + net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT) { + if (virNetDevSetOnline(net->ifname, true) < 0) + goto cleanup; + + /* Set the routes */ + for (j = 0; j < net->nroutes; j++) { + virNetworkRouteDefPtr route = net->routes[j]; + + if (virNetDevAddRoute(net->ifname, + virNetworkRouteDefGetAddress(route), + virNetworkRouteDefGetPrefix(route), + virNetworkRouteDefGetGateway(route), + virNetworkRouteDefGetMetric(route)) < 0) { + goto cleanup; + } + } + } + + if (net->script && qemuExecuteEthernetScript(net->ifname, net->script) < 0) goto cleanup; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index aed50f546263..6e32ebbf6cee 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1039,21 +1039,28 @@ virNetDevCreateNetlinkAddressMessage(int messageType, const char *ifname, virSocketAddr *addr, unsigned int prefix, - virSocketAddr *broadcast) + virSocketAddr *broadcast, + virSocketAddr *peer) { struct nl_msg *nlmsg = NULL; struct ifaddrmsg ifa; unsigned int ifindex; void *addrData = NULL; + void *peerData = NULL; void *broadcastData = NULL; size_t addrDataLen; if (virNetDevGetIPAddressBinary(addr, &addrData, &addrDataLen) < 0) return NULL; - if (broadcast && virNetDevGetIPAddressBinary(broadcast, &broadcastData, - &addrDataLen) < 0) - return NULL; + if (peer && VIR_SOCKET_ADDR_VALID(peer)) { + if (virNetDevGetIPAddressBinary(peer, &peerData, &addrDataLen) < 0) + return NULL; + } else if (broadcast) { + if (virNetDevGetIPAddressBinary(broadcast, &broadcastData, + &addrDataLen) < 0) + return NULL; + } /* Get the interface index */ if ((ifindex = if_nametoindex(ifname)) == 0) @@ -1078,12 +1085,15 @@ virNetDevCreateNetlinkAddressMessage(int messageType, if (nla_put(nlmsg, IFA_LOCAL, addrDataLen, addrData) < 0) goto buffer_too_small; - if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, addrData) < 0) - goto buffer_too_small; + if (peerData) { + if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, peerData) < 0) + goto buffer_too_small; + } - if (broadcastData && - nla_put(nlmsg, IFA_BROADCAST, addrDataLen, broadcastData) < 0) - goto buffer_too_small; + if (broadcastData) { + if (nla_put(nlmsg, IFA_BROADCAST, addrDataLen, broadcastData) < 0) + goto buffer_too_small; + } return nlmsg; @@ -1098,6 +1108,7 @@ virNetDevCreateNetlinkAddressMessage(int messageType, * virNetDevSetIPAddress: * @ifname: the interface name * @addr: the IP address (IPv4 or IPv6) + * @peer: The IP address of peer (IPv4 or IPv6) * @prefix: number of 1 bits in the netmask * * Add an IP address to an interface. This function *does not* remove @@ -1108,6 +1119,7 @@ virNetDevCreateNetlinkAddressMessage(int messageType, */ int virNetDevSetIPAddress(const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) { virSocketAddr *broadcast = NULL; @@ -1116,9 +1128,8 @@ int virNetDevSetIPAddress(const char *ifname, struct nlmsghdr *resp = NULL; unsigned int recvbuflen; - /* The caller needs to provide a correct address */ - if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET) { + if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && !VIR_SOCKET_ADDR_VALID(peer)) { /* compute a broadcast address if this is IPv4 */ if (VIR_ALLOC(broadcast) < 0) return -1; @@ -1129,7 +1140,7 @@ int virNetDevSetIPAddress(const char *ifname, if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifname, addr, prefix, - broadcast))) + broadcast, peer))) goto cleanup; if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, @@ -1288,7 +1299,7 @@ int virNetDevClearIPAddress(const char *ifname, if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifname, addr, prefix, - NULL))) + NULL, NULL))) goto cleanup; if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, @@ -1423,21 +1434,27 @@ virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) int virNetDevSetIPAddress(const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) { virCommandPtr cmd = NULL; - char *addrstr = NULL, *bcaststr = NULL; + char *addrstr = NULL, *bcaststr = NULL, *peerstr = NULL; virSocketAddr broadcast; int ret = -1; if (!(addrstr = virSocketAddrFormat(addr))) goto cleanup; + + if (VIR_SOCKET_ADDR_VALID(peer) && !(peerstr = virSocketAddrFormat(&peer))) + goto cleanup; + /* format up a broadcast address if this is IPv4 */ - if ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) && + if (!peerstr && ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) && ((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) || - !(bcaststr = virSocketAddrFormat(&broadcast)))) { + !(bcaststr = virSocketAddrFormat(&broadcast))))) { goto cleanup; } + # ifdef IFCONFIG_PATH cmd = virCommandNew(IFCONFIG_PATH); virCommandAddArg(cmd, ifname); @@ -1446,6 +1463,8 @@ int virNetDevSetIPAddress(const char *ifname, else virCommandAddArg(cmd, "inet"); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (peerstr) + virCommandAddArgList(cmd, "pointopoint", peerstr, NULL); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArg(cmd, "alias"); @@ -1453,6 +1472,8 @@ int virNetDevSetIPAddress(const char *ifname, cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (peerstr) + virCommandAddArgList(cmd, "peer", peerstr, NULL); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArgList(cmd, "dev", ifname, NULL); @@ -1465,6 +1486,7 @@ int virNetDevSetIPAddress(const char *ifname, cleanup: VIR_FREE(addrstr); VIR_FREE(bcaststr); + VIR_FREE(peerstr); virCommandFree(cmd); return ret; } diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index e7719d58a410..240fff774d30 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -90,6 +90,7 @@ int virNetDevGetOnline(const char *ifname, int virNetDevSetIPAddress(const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevAddRoute(const char *ifname, -- 2.7.3

2 3