- Devel - libvirt List Archives

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 27 May '16

27 May '16

Pulls in several portability fixes, including the fact that gnulib now only works on platforms with two's complement signed integers. Also makes for a smaller delta on the next update (we are waiting on a license change to unsetenv for the sake of mingw). * .gnulib: Update to latest. * bootstrap: Resync from upstream. * tests/virstringtest.c: Drop use of obsolete probes of integer properties. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'd like to get this in now, before RC1 is cut, so that we maximize the testing of the bulk of the gnulib changes (rather than waiting for the unsetenv change needed for mingw to land, but forcing the gnulib update to only get testing in RC2). * .gnulib 6cc32c6...8d807a9 (127): > gendocs.sh: Set default TOP_NODE_UP_URL in HTML output. > manywarnings: update for GCC 6.1 > autoupdate > intdiv0, memmem, nocrash, strcasestr, strstr: no exit > glob: size_t overflow checks > glob: don't assume INT_MAX < SIZE_MAX > Fix undefined behaviour in gettext.h. > autoupdate > git-version-gen: avoid undefined shift > update from texinfo > glob: merge glibc changes into lib/glob.c > mktime: spelling fix in comment > mktime: port to stricter signed overflow checking > mktime: speed up DEBUG_MKTIME benchmarks > mktime: resurrect DEBUG_MKTIME testing > mktime: simplify DEBUG_MKTIME > Port mktime_internal offset to unsigned time_t > xstrtol: prohibit monstrosities like "1bB" > xstrtod: reinstate setting of *result upon ERANGE > xstrtod: modify *result only if no errors > btowc: document problems in C locale > autoupdate > update from texinfo > mktime: improve integer overflow checking > intprops: check two's complement assumption > intprops, mktime, strtol: assume two's complement > stdint: port to strict C11 left shift > mbrtowc: work around glibc bug#19932 > update from texinfo > autoupdate > stdint: detect good enough pre-C++11 stdint.h in C++ mode > argp: merge changes from glibc > Prefer American spelling for "initialize" > autoupdate > stddef: support configuring with g++ > autoupdate > autoupdate > update from texinfo > test-framework-sh: minor cleanups > test-framework-sh: revert port to NetBSD 7.0 > autoupdate > Port better to Alpine Linux > test-framework-sh: port to NetBSD 7.0 > update from texinfo > gitlog-to-changelog: suppress ignored chatter > update from texinfo > update from texinfo > setlocale: add "sv" to Windows language table > update from texinfo > sys_select: port to new Cygwin > test-userspec.c: do not trigger gcc's new -Wmisleading-indentation > time_rz: port to clang -Wunused-const-variable > std-gnu11: improve clang support > select: port more to Intel 2016.1.150 compiler > select: try to port to 2016.1.150 compiler > localename-tests: memory allocation fixes > intprops: make .h file license match module > acl: fix missing return on Cygwin > update from texinfo > update from texinfo > extern-inline: port to PGI CC > update from texinfo > update from texinfo > signbit: port back to pre-C++11 GCC > mountlist: recognize autofs-mounted remote file systems, too > signbit: port to C++ with GCC 6 > regex: make it closer to libc > regex: merge patches from libc > update from texinfo > update from texinfo > autoupdate > autoupdate > stdalign: port to older HP and IBM cc > stdalign: port to clang 3.7.0 > update from texinfo > readdir_r: now obsolescent > Use modern texinfo when syncing install.texi output from autoconf > update from texinfo > sync install.texi from autoconf > misc: port better to gcc -fsanitize=address > update from texinfo > autoupdate > verify-tests: also remove stray test-verify.Tpo > std-gnu11: new module > update from texinfo > update from texinfo > get-permissions, strftime: fix grammar in comments > gettext: mark as obsolete > gnulib-tool: don't give up on ln -s so easily > closedir: fix OS/2-related typos > openat_proc_name: fix that last '/' is overwritten on OS/2 kLIBC > regex: treat [x] as x if x is a unibyte encoding error > closedir, dirfd, opendir: port to OpenSolaris 5.10 > bootstrap: use American spelling > @item needed inside @itemize > hash-pjw-bare: fix comment > wcwidth: Replace also on OpenBSD 5.8 > update from texinfo > gnu-web-doc-update: fix addition of new files > utimens-tests: avoid pulling gettext .m4 files > regex: pacify static checkers > regex: fix [ diagnostic > regex: fix memory leaks > fts: don't unconditionally use leaf optimization for NFS > * gnulib-tool: fix stray debug line in previous patch > gnulib-tool: don't assume ln -s works > utimes: detect utimes() correctly on OS/2 kLIBC > openat_proc_name: port to OS/2 kLIBC > stdint: check _INTPTR_T_DECLARED for intptr_t etc. > doc: mention unfixed issues with unsupported localtime() values > Go back to gettext-0.19.7 > opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC > dup, dup2, fcntl: support a directory fd on OS/2 kLIBC > pipe_filter_ii_execute: port to OS/2 kLIBC > wchar: fix "conflicting types" error for __wcwidth on OS/2 kLIBC > w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC > pipe-filter-aux: undefine HAVE_SELECT on KLIBC > binary-io: don't put fd in binary mode if it is a console on EMX > doc: mention setlocale() issues on OpenBSD > sig2str: list all signals on FreeBSD >= 7 > acl-permissions: port to USE_ACL==0 platforms > mktime: rename macro to avoid glibc clash > Port "$@" to OpenIndiana ksh93 > autoupdate > Port Universal Time settings to strict POSIX > update from texinfo > update from texinfo .gnulib | 2 +- bootstrap | 6 +++--- tests/virstringtest.c | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gnulib b/.gnulib index 6cc32c6..8d807a9 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892 +Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 diff --git a/bootstrap b/bootstrap index 294c0bc..f060bab 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2014-12-08.12; # UTC +scriptversion=2016-01-24.06; # UTC # Bootstrap this package from checked-out sources. @@ -42,7 +42,7 @@ export LC_ALL local_gl_dir=gl -# Honour $PERL, but work even if there is none +# Honor $PERL, but work even if there is none. PERL="${PERL-perl}" me=$0 @@ -1021,6 +1021,6 @@ echo "$0: done. Now you can run './configure'." # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 7a1dcfd..63b8009 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-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 @@ -23,7 +23,6 @@ #include <stdlib.h> #include "testutils.h" -#include "intprops.h" #include "verify.h" #include "virerror.h" #include "viralloc.h" @@ -409,13 +408,11 @@ struct stringToLongData { /* This test makes assumptions about our compilation platform that are * not guaranteed by POSIX. Good luck to you if you are crazy enough - * to try and port libvirt to a platform with 16-bit int. */ + * to try and port libvirt to a platform with 16-bit int. Gnulib + * already assumes that signed integers are two's complement. */ verify(sizeof(int) == 4); -verify(TYPE_TWOS_COMPLEMENT(int)); verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long)); -verify(TYPE_TWOS_COMPLEMENT(long)); verify(sizeof(long long) == 8); -verify(TYPE_TWOS_COMPLEMENT(long long)); static int testStringToLong(const void *opaque) -- 2.5.5

7 12

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 27 May '16

27 May '16

Fix a regression in checking for realpath (which caused link failures regarding duplicate rpl_canonicalize_file_name), and fix the mingw build regarding unsetenv. * .gnulib: Update to latest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Fixes the reported failure with canonicalize_file_name, but there's still the issue of new gcc warnings enabled which affect F24 with its newer gcc. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) * .gnulib 8d807a9...246b3b2 (3): > canonicalize: Fix broken probe for realpath. > unsetenv: relax to LGPLv2+ > update from texinfo diff --git a/.gnulib b/.gnulib index 8d807a9..246b3b2 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 +Subproject commit 246b3b28808ee5f4664be674dce573af9497fc7a -- 2.5.5

1 0

[libvirt] inconsistency in attribute usage between hv drivers
by Laine Stump 27 May '16

27 May '16

I just came across this problem while looking for the proper place to put <ip> info for the host side of <interface type='ethernet'>. I don't think there's really anything that can be done about it now, since everything below has been in place for so long, but maybe it can serve as a cautionary tale. Prologue: A week or two ago, I made patches to support <interface type='ethernet'> in the LXC driver. I did this not because I have a need for that, but because it seemed like the perfect avenue for investigating the best way to add IP address and route config to <interface>, as it is one environment where we have a need *and* the ability to setup IP info for both the host and guest sides of the interface. I accomplished this by simply generalizing the existing <interface type='bridge'> code to not attach the host-side veth device to a bridge. This makes all common attributes between type='ethernet' and type='bridge' consistent, including the configuration of guest-side and host-side device names, and here we come to the first inconsistency - the device name for the veth/tap on the host side is in the <target> element (which I've always been told is supposed to be used for device-specific info about how the device will be presented on the *guest* side, but I suppose this is because <interface type='direct'> uses <source dev='blah'> to provide the name of the physical device that the macvtap device (named in <target dev='macvblah'/> is attached to). And I guess because the dev attribute was already in-use in <target> the much more recently added guest-side name is given in the <guest> subelement (in LXC at least): <interface type='ethernet'> <target dev='hostblah'/> <-- name of veth on host side <guest dev='guestblah'/> <-- name of veth on guest side ... Now, this "is what it is". There is no changing it. In particular, the use of <target dev> for the host-side device name has been in use for so long and is so deeply ingrained that it's just part of the scenery. Moving for a minute to the IP address/route info for the guest side is already configured in the toplevel <ip> and <route> subelements of <interface>, <interface type='ethernet'> <ip address='1.2.3.4' .../> </interface> My first thought was to put the <ip> for the host side inside <source>: <interface type='ethernet'> <source> <ip address='1.2.3.5' .../> <-- host side </source> <ip address='1.2.3.4' .../> <-- guest side </interface> That makes sense to me because it parallels what we do with PCI addresses for hostdev - the PCI address in <source> tells what the address is on the host, and the one at the toplevel of <hostdev> tells what the PCI address will be in the guest. It *doesn't* fit well with the fact that the device we're setting up is named in <target> though, so we're already inconsistent, but putting the host-side IP config in <target> seems like an invitation to mix things up even more in the future, since <target> is used everywhere else as a place to put stuff related to what the device looks like in the guest (although... for <interface>, <target> *is* currently used only for the host-side tap/veth device name; so maybe we just can define the purpose of <target> differently in this one case... But I digress). So I went to the code to add parsing of <ip> inside <source>, and found that the type-specific data for ethernet has a dev, and that field in the object is set during parsing from <source dev='blah'/>, *and* that the openvz driver uses that dev name as the name of the network device in the *guest*! (even though my understanding of <source> is that it is supposed to be used for information about the *host* side of any device. Sigh.) So on openvz, we have this: <interface type='ethernet'> <target dev='hostblah'/> <-- name of interface on host side <source dev='guestblah'/> <-- name of interface on guest side ... which seems exactly the opposite of what it should be. Note that this doesn't seem to be documented anywhere except in the few lines in openvz_driver.c that implement it. (Note that, prior to commit 9a4b705f7 back in 2010, which added support for type='ethernet' in openvz, the "dev" field was already in the ethernet-specific sub-object of virDomainNetDef, but it was only used to hold the name of the bridge that a tap device was attached to when converting from a qemu commandline to XML (also, as previously stated, for type='direct' it is used to name the physical device on the host that the macvtap interface is connected to, i.e. *exactly* the opposite end of the chain). It looks like the poster of the openvz patch just saw an opportune existing-but-unused-by-type=ethernet attribute and took advantage, and it wasn't noticed in review). I'm actually skeptical that anyone even uses this, since openvz is a less-used driver, type='ethernet' is less used among interface types, and even after that it's valid to not provide a name, in which case one is automatically generated. But there is no way to verify that, so we're stuck with it. It is true that the LXC version of type='ethernet' was added only a few days ago, and there hasn't yet been a release, so I *could* modify it to be consistent with the attribute usage in the openvz driver. But that would make <interface type='ethernet'> in LXC inconsistent with <interface type='bridge'> in LXC, which is a much worse situation. IT seems there is nothing to change. As I said above "it is what it is". So why am I writing this message? Partly to just vent frustration (aka "whine") I suppose :-). Also partly as public testimony that my seemingly excessive worrying over attribute naming and placement is justified, and not just OCD. Also, as I said above, as a cautionary tale that any patch adding *any* XML config knob, or making use of an existing XML config knob needs extra scrutiny to help minimize such messes in the future.

1 0

[libvirt] [PATCH] unsetenv: relax to LGPLv2+
by Eric Blake 27 May '16

27 May '16

Especially since setenv is also LGPLv2+, and it makes sense for the two modules to stay in sync. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Libvirt wants LGPLv2+ when it uses gnulib, and recently ran into a problem where it can use the setenv module for mingw but not the unsetenv module. Barring any negative reviews, I'll push this in 24 hours, or sooner if I get a positive review; then libvirt will have to pick up the latest gnulib to make use of it. modules/unsetenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/unsetenv b/modules/unsetenv index 015ac4e..909cec9 100644 --- a/modules/unsetenv +++ b/modules/unsetenv @@ -24,7 +24,7 @@ Include: <stdlib.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.5.5

1 1

[libvirt] [PATCH] lxc: Fix virLXCDomainObjBeginJob position in lxcDomainSetMemoryParameters
by Katerina Koukiou 27 May '16

27 May '16

Adjust the code to perform the virLXCDomainObjBeginJob first and then the call virDomainLiveConfigHelperMethod. As Ján Tomko pointed out, in virDomainLiveConfigHelperMethod, there is a check to see if the domain is active when AFFECT_LIVE is set. Since virLXCDomainObjBeginJob unlocks the virDomainObjPtr lock, the domain could possibly be destroyed while we wait for the job and the check results would no longer be valid. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3aadd64..f883ffb 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -841,14 +841,16 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, cfg = virLXCDriverGetConfig(driver); if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) < 0 || - !(caps = virLXCDriverGetCapabilities(driver, false)) || - virDomainLiveConfigHelperMethod(caps, driver->xmlopt, - vm, &flags, &vmdef) < 0) + !(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; + if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, + vm, &flags, &vmdef) < 0) + goto endjob; + if (flags & VIR_DOMAIN_AFFECT_LIVE && !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_MEMORY)) { virReportError(VIR_ERR_OPERATION_INVALID, -- 2.7.4

2 1

[libvirt] New account at Wiki
by Artur Zochniak 26 May '16

26 May '16

Hello! Can I have an account for wiki? I ask here because I am following http://wiki.libvirt.org/page/Main_Page#libvirt_Wiki preferred username: arjamizo Thanks! BR Artur

1 0

[libvirt] [PATCHv2] Added hook for network modification event
by Khramov Anton 26 May '16

26 May '16

From: Anton Khramov <anton(a)endocode.com> Anton Khramov (1): network: Added hook for network modification event docs/hooks.html.in | 2 ++ src/network/bridge_driver.c | 5 +++++ src/util/virhook.c | 3 ++- src/util/virhook.h | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) -- 1.9.1

2 2

[libvirt] [PATCH v2] esx: do not store escaped password in esxVI_Context.
by Dawid Zamirski 26 May '16

26 May '16

This patch fixes an issue where screenshot API call was failing when the esx/vcenter password contains special characters such as apostrophee. The reason for failures was that passwords were escaped for XML and stored in esxVI_Context which was then passed to raw CURL API calls where the password must be passed in original form to authenticate successfully. So this patch addresses this by storing original passwords in the esxVI_Context struct and escape only for esxVI_Login call. --- Changes made since v1: * Also patch esxVI_EnsureSession * Added cleanup to esxVI_Context_Connect to make sure escapedPassword is freed where appropiate. Also move the code block that escapes the password to happen earlier in the function body so that it can bail earlier in the event of failure and skip the rest of the processing. * Updated virReportError calls to pass syntax-check src/esx/esx_driver.c | 22 ++++--------------- src/esx/esx_vi.c | 62 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 00d0e0a..031c666 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -617,7 +617,6 @@ esxConnectToHost(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -647,18 +646,13 @@ esxConnectToHost(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); + password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, conn->uri->server, conn->uri->port) < 0) goto cleanup; @@ -705,7 +699,6 @@ esxConnectToHost(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); @@ -726,7 +719,6 @@ esxConnectToVCenter(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -752,18 +744,13 @@ esxConnectToVCenter(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, hostname); + password = virAuthGetPassword(conn, auth, "esx", username, hostname); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, conn->uri->port) < 0) goto cleanup; @@ -799,7 +786,6 @@ esxConnectToVCenter(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 6520196..5fb2279 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -996,39 +996,52 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { + int result = -1; + char *escapedPassword = NULL; + if (!ctx || !url || !ipAddress || !username || !password || ctx->url || ctx->service || ctx->curl) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } + escapedPassword = esxUtil_EscapeForXml(password); + + if (!escapedPassword) { + VIR_FREE(escapedPassword); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to escape password for XML")); + goto cleanup; + } + if (esxVI_CURL_Alloc(&ctx->curl) < 0 || esxVI_CURL_Connect(ctx->curl, parsedUri) < 0 || VIR_STRDUP(ctx->url, url) < 0 || VIR_STRDUP(ctx->ipAddress, ipAddress) < 0 || VIR_STRDUP(ctx->username, username) < 0 || VIR_STRDUP(ctx->password, password) < 0) { - return -1; + goto cleanup; } if (VIR_ALLOC(ctx->sessionLock) < 0) - return -1; + goto cleanup; + if (virMutexInit(ctx->sessionLock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize session mutex")); - return -1; + goto cleanup; } if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) - return -1; + goto cleanup; if (STRNEQ(ctx->service->about->apiType, "HostAgent") && STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " "but found '%s'"), ctx->service->about->apiType); - return -1; + goto cleanup; } if (virParseVersionString(ctx->service->about->apiVersion, @@ -1036,14 +1049,14 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse VI API version '%s'"), ctx->service->about->apiVersion); - return -1; + goto cleanup; } if (ctx->apiVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Minimum supported %s version is %s but found version '%s'"), "VI API", "2.5", ctx->service->about->apiVersion); - return -1; + goto cleanup; } if (virParseVersionString(ctx->service->about->version, @@ -1051,7 +1064,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse product version '%s'"), ctx->service->about->version); - return -1; + goto cleanup; } if (STREQ(ctx->service->about->productLineId, "gsx")) { @@ -1060,7 +1073,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_GSX), "2.0", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_GSX; @@ -1071,7 +1084,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_ESX), "3.5", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_ESX; @@ -1081,7 +1094,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), "2.5", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_VPX; @@ -1090,7 +1103,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " "or 'vpx' but found '%s'"), ctx->service->about->productLineId); - return -1; + goto cleanup; } if (ctx->productLine == esxVI_ProductLine_ESX) { @@ -1107,12 +1120,19 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + + + if (esxVI_Login(ctx, username, escapedPassword, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { - return -1; + goto cleanup; } - return 0; + result = 0; + + cleanup: + VIR_FREE(escapedPassword); + + return result; } int @@ -2062,6 +2082,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) esxVI_ObjectContent *sessionManager = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_UserSession *currentSession = NULL; + char *escapedPassword = NULL; if (!ctx->sessionLock) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no mutex")); @@ -2075,6 +2096,14 @@ esxVI_EnsureSession(esxVI_Context *ctx) goto cleanup; } + escapedPassword = esxUtil_EscapeForXml(ctx->password); + + if (!escapedPassword) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to escape password for XML")); + goto cleanup; + } + if (esxVI_String_AppendValueToList(&propertyNameList, "currentSession") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, @@ -2101,7 +2130,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (!currentSession) { esxVI_UserSession_Free(&ctx->session); - if (esxVI_Login(ctx, ctx->username, ctx->password, NULL, + if (esxVI_Login(ctx, ctx->username, escapedPassword, NULL, &ctx->session) < 0) { goto cleanup; } @@ -2117,6 +2146,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) cleanup: virMutexUnlock(ctx->sessionLock); + VIR_FREE(escapedPassword); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&sessionManager); esxVI_UserSession_Free(&currentSession); -- 2.7.4

2 1

[libvirt] [PATCH] testutils.c: unsetenv() iff platform has it
by Michal Privoznik 26 May '16

26 May '16

I've encountered the following problem (introduced by 6326865e): ../../tests/testutils.c: In function 'virtTestRun': ../../tests/testutils.c:289:5: error: implicit declaration of function 'unsetenv' [-Werror=implicit-function-declaration] unsetenv("VIR_TEST_MOCK_TESTNAME"); Apparently, mingw does not have unsetenv(). Therefore we should call it iff we are sure platform we are building for has it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is a tentative patch. Ideally, we would use gnulib's implementation (like we do for setenv()), but there are some licensing problems right now [1]. If they are resolved before our release, we can just pick new gnulib. If, however, they are not, we can just push this patch. 1: https://www.redhat.com/archives/libvir-list/2016-May/msg01952.html tests/testutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index f4fbad2..8b7bf70 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -286,7 +286,9 @@ virtTestRun(const char *title, } #endif /* TEST_OOM */ +#ifdef HAVE_UNSETENV unsetenv("VIR_TEST_MOCK_TESTNAME"); +#endif return ret; } -- 2.8.3

2 2

[libvirt] [PATCH] qemu: Fix error message when PCI bridge has index <= bus
by Andrea Bolognani 26 May '16

26 May '16

Commit ff2126225df0 changed the error message to be more detailed about the failure at hand; however, while the new error message claims that "bus must be <= index", the error message is displayed if "idx <= addr->bus", ie. when bus is bigger than or *equal to* index. Change the error message to report the correct constraint, and format it in a way that mirrors the check exactly to make it clearer to people reading the code. The new error message reads "must be index > bus". --- I'm assuming the code, which is pre-existing, is correct here. CC'ing Laine for insights. src/qemu/qemu_domain_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7bd8ee5..650cb2a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1598,14 +1598,14 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, break; } - /* check if every PCI bridge controller's ID is greater than + /* check if every PCI bridge controller's index is greater than * the bus it is placed onto */ if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE && idx <= addr->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("PCI controller at index %d (0x%02x) has " - "bus='0x%02x', but bus must be <= index"), + "bus='0x%02x'; must be index > bus"), idx, idx, addr->bus); goto cleanup; } -- 2.5.5

2 2