- Devel - libvirt List Archives

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

07 Apr '16

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

2 5

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

07 Apr '16

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

3 3

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

07 Apr '16

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

1 1

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

07 Apr '16

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

2 2

[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 06 Apr '16

06 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