- Devel - libvirt List Archives

[libvirt] Schedule for libvirt-0.9.10 release
by Daniel Veillard 28 Jan '12

28 Jan '12

First I don't see any good reason to try to bump the major release number :-) so next release is expected to be 0.9.10, hope there isn't disapointment ;-) [1] Second I would really like to keep the monthly shedule, and have the release done by February 6 or earlier, so this would mean entering the 0.9.10 freeze on Monday 30, i.e. in a bit less than two weeks. I hope this is okay, Daniel [1] actually the addition of fine grained access control would be a good reason for such a version bump -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH 0/4] API for modification of domain metadata
by Peter Krempa 27 Jan '12

27 Jan '12

This patchset is based on my previous work to add a domain title. I chose a more general aproach to allow working with the <metadata> element as suggested by Eric and Daniel, although I did not implement the <metadata> operations code. I only provided a patch for the qemu driver for review, but I'll follow up with a patch for LXC as well as I'll have a final version of this. Peter Krempa (4): xml: Add element <title> to allow short description of domains API: Add api to set and get domain metadata virsh: Add support for modifying domain description and titles qemu: Add support for virDomainGetMetadata and virDomainSetMetadata docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 13 +- include/libvirt/libvirt.h.in | 31 +++ include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 19 ++ src/conf/domain_conf.h | 1 + src/driver.h | 15 + src/libvirt.c | 125 +++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 195 ++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 ++- src/util/virterror.c | 6 + .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 274 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 17 files changed, 758 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

4 11

[libvirt] [PATCH] tests: fix reversed comparisons
by Eric Blake 27 Jan '12

27 Jan '12

Otherwise, a failed test gives misleading output. * tests/commandtest.c (test13, test14, test16): Pass arguments in correct order. --- Pushing under the trivial rule. tests/commandtest.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index b4b6044..9b9130c 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1,7 +1,7 @@ /* * commandtest.c: Test the libCommand API * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 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 @@ -481,7 +481,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) cmd = NULL; if (!STREQ(outactual, outexpect)) { - virtTestDifference(stderr, outactual, outexpect); + virtTestDifference(stderr, outexpect, outactual); goto cleanup; } @@ -526,11 +526,11 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) cmd = NULL; if (!STREQ(outactual, outexpect)) { - virtTestDifference(stderr, outactual, outexpect); + virtTestDifference(stderr, outexpect, outactual); goto cleanup; } if (!STREQ(erractual, errexpect)) { - virtTestDifference(stderr, erractual, errexpect); + virtTestDifference(stderr, errexpect, erractual); goto cleanup; } @@ -604,7 +604,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) } if (!STREQ(outactual, outexpect)) { - virtTestDifference(stderr, outactual, outexpect); + virtTestDifference(stderr, outexpect, outactual); goto cleanup; } -- 1.7.7.6

1 0

[libvirt] [PATCH v2] Return more error output if policykit auth fails.
by Cole Robinson 27 Jan '12

27 Jan '12

Several not uncommon issues can be diagnosed through pkcheck output, like lack of/malfunctioning desktop agent, or lack of/malfunctioning polkit dbus agent. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Don't print (null) for empty output daemon/remote.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 4725896..d2150bf 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2472,7 +2472,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, int status = -1; char *ident = NULL; bool authdismissed = 0; - char *pkout = NULL; + char *pkout = NULL, *pkerr = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2484,6 +2484,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); virCommandSetOutputBuffer(cmd, &pkout); + virCommandSetErrorBuffer(cmd, &pkerr); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2537,15 +2538,22 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, error: virCommandFree(cmd); VIR_FREE(ident); - VIR_FREE(pkout); virResetLastError(); + if (authdismissed) { virNetError(VIR_ERR_AUTH_CANCELLED, "%s", _("authentication cancelled by user")); + } else if (pkout || pkerr) { + virNetError(VIR_ERR_AUTH_FAILED, "%s %s", + pkerr ? pkerr : "", + pkout ? pkout : ""); } else { virNetError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); } + + VIR_FREE(pkout); + VIR_FREE(pkerr); virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; -- 1.7.7.5

2 2

[libvirt] [PATCH v2] Add new error code VIR_ERROR_AUTH_CANCELLED
by Cole Robinson 27 Jan '12

27 Jan '12

And hook it up for policykit auth. This allows virt-manager to detect that the user clicked the policykit 'cancel' button and not throw an 'authentication failed' error message at the user. v2: Don't leak pkout Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/remote.c | 14 ++++++++++++-- include/libvirt/virterror.h | 1 + src/util/virterror.c | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1ada146..cedc26a 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2471,6 +2471,8 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, const char *action; int status = -1; char *ident = NULL; + int authdismissed = 0; + char *pkout = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2481,6 +2483,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, "org.libvirt.unix.manage"; cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); + virCommandSetOutputBuffer(cmd, &pkout); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2509,6 +2512,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, if (virCommandRun(cmd, &status) < 0) goto authfail; + authdismissed = (pkout && strstr(pkout, "dismissed=true")); if (status != 0) { char *tmp = virCommandTranslateStatus(status); VIR_ERROR(_("Policy kit denied action %s from pid %lld, uid %d: %s"), @@ -2533,9 +2537,15 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, error: virCommandFree(cmd); VIR_FREE(ident); + VIR_FREE(pkout); virResetLastError(); - virNetError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed")); + if (authdismissed) { + virNetError(VIR_ERR_AUTH_CANCELLED, "%s", + _("authentication cancelled by user")); + } else { + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + } virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e896d67..9844cbe 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -243,6 +243,7 @@ typedef enum { risky domain snapshot revert */ VIR_ERR_OPERATION_ABORTED = 78, /* operation on a domain was canceled/aborted by user */ + VIR_ERR_AUTH_CANCELLED = 79, /* authentication cancelled */ } virErrorNumber; /** diff --git a/src/util/virterror.c b/src/util/virterror.c index 85eec8d..31ddd9d 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1022,6 +1022,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("authentication failed: %s"); break; + case VIR_ERR_AUTH_CANCELLED: + if (info == NULL) + errmsg = _("authentication cancelled"); + else + errmsg = _("authentication cancelled: %s"); + break; case VIR_ERR_NO_STORAGE_POOL: if (info == NULL) errmsg = _("Storage pool not found"); -- 1.7.7.5

2 5

[libvirt] [PATCH 1/2] qemu: caps: Fix segfault on daemon startup
by Cole Robinson 27 Jan '12

27 Jan '12

On my f16 box at least, this tries to free p unconditionally which isn't always okay, 'p' is freeable only under a limited scope. --- src/qemu/qemu_capabilities.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6dee9d8..5487ecd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1336,10 +1336,9 @@ fail: qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse %s version number in '%s'"), qemu, p ? p : help); - -cleanup: VIR_FREE(p); +cleanup: return -1; } -- 1.7.7.5

2 2

[libvirt] [PATCH 2/2] Add new error code VIR_ERROR_AUTH_CANCELLED
by Cole Robinson 27 Jan '12

27 Jan '12

And hook it up for policykit auth. This allows virt-manager to detect that the user clicked the policykit 'cancel' button and not throw an 'authentication failed' error message at the user. --- daemon/remote.c | 13 +++++++++++-- include/libvirt/virterror.h | 1 + src/util/virterror.c | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1ada146..2e813d6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2471,6 +2471,8 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, const char *action; int status = -1; char *ident = NULL; + int authdismissed = 0; + char *pkoutput = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2481,6 +2483,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, "org.libvirt.unix.manage"; cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); + virCommandSetOutputBuffer(cmd, &pkoutput); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2509,6 +2512,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, if (virCommandRun(cmd, &status) < 0) goto authfail; + authdismissed = (pkoutput && strstr(pkoutput, "dismissed=true")); if (status != 0) { char *tmp = virCommandTranslateStatus(status); VIR_ERROR(_("Policy kit denied action %s from pid %lld, uid %d: %s"), @@ -2534,8 +2538,13 @@ error: virCommandFree(cmd); VIR_FREE(ident); virResetLastError(); - virNetError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed")); + if (authdismissed) { + virNetError(VIR_ERR_AUTH_CANCELLED, "%s", + _("authentication cancelled by user")); + } else { + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + } virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e896d67..9844cbe 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -243,6 +243,7 @@ typedef enum { risky domain snapshot revert */ VIR_ERR_OPERATION_ABORTED = 78, /* operation on a domain was canceled/aborted by user */ + VIR_ERR_AUTH_CANCELLED = 79, /* authentication cancelled */ } virErrorNumber; /** diff --git a/src/util/virterror.c b/src/util/virterror.c index 85eec8d..31ddd9d 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1022,6 +1022,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("authentication failed: %s"); break; + case VIR_ERR_AUTH_CANCELLED: + if (info == NULL) + errmsg = _("authentication cancelled"); + else + errmsg = _("authentication cancelled: %s"); + break; case VIR_ERR_NO_STORAGE_POOL: if (info == NULL) errmsg = _("Storage pool not found"); -- 1.7.7.5

1 1

[libvirt] [PATCH] build: fix missing include
by Eric Blake 27 Jan '12

27 Jan '12

Fix a build failure: virt-host-validate.c: In function 'main': virt-host-validate.c:82:5: error: implicit declaration of function 'setlocale' [-Werror=implicit-function-declaration] virt-host-validate.c:82:5: error: nested extern declaration of 'setlocale' [-Werror=nested-externs] virt-host-validate.c:82:20: error: 'LC_ALL' undeclared (first use in this function) * tools/virt-host-validate.c: Add <locale.h>. --- Pushing under the build-breaker rule. tools/virt-host-validate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index 3893ba3..cdf8302 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <gettext.h> #include <getopt.h> +#include <locale.h> #include "internal.h" #include "configmake.h" -- 1.7.7.6

1 0

[libvirt] [PATCH] xml: fix struct typos
by Eric Blake 27 Jan '12

27 Jan '12

Noticed this while reviewing Dan's patches. * src/util/xml.c (virXMLRewritFileData): Rename to virXMLRewriteFileData. --- Pushing under the trivial rule. src/util/xml.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index 2909e85..b0d90de 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -1,7 +1,7 @@ /* * xml.c: XML based interfaces for the libvir library * - * Copyright (C) 2005, 2007-2011 Red Hat, Inc. + * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -801,7 +801,7 @@ error: } -struct virXMLRewritFileData { +struct virXMLRewriteFileData { const char *warnName; const char *warnCommand; const char *xml; @@ -810,7 +810,7 @@ struct virXMLRewritFileData { static int virXMLRewriteFile(int fd, void *opaque) { - struct virXMLRewritFileData *data = opaque; + struct virXMLRewriteFileData *data = opaque; if (data->warnName && data->warnCommand) { if (virEmitXMLWarning(fd, data->warnName, data->warnCommand) < 0) @@ -829,7 +829,7 @@ virXMLSaveFile(const char *path, const char *warnCommand, const char *xml) { - struct virXMLRewritFileData data = { warnName, warnCommand, xml }; + struct virXMLRewriteFileData data = { warnName, warnCommand, xml }; return virFileRewrite(path, S_IRUSR | S_IWUSR, virXMLRewriteFile, &data); } -- 1.7.7.6

1 0

[libvirt] [PATCH 0/3] Make util.[ch] a little bit smaller still
by Daniel P. Berrange 27 Jan '12

27 Jan '12

In keeping with the drive to stop src/util/util.[ch] being a general dumping ground, move some more functions out into their own dedicated files

2 8