- Devel - libvirt List Archives

[libvirt] Start of freeze for libvirt-0.9.4 and availability of rc1
by Daniel Veillard 02 Aug '11

02 Aug '11

As plannned we are entering the freeze for libvirt-0.9.4 . I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.4-rc1.tar.gz This seems to pass my minimal tests without problems, but please give it a try too and report problems, I will probably make an rc2 on Thursday or Friday, and then the final release next Monday or Tuesday, thanks ! Daniel -- 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/

13 39

[libvirt] ANNOUNCE: virt-manager 0.9.0 and virtinst 0.600.0 released
by Cole Robinson 02 Aug '11

02 Aug '11

I'm happy to announce two new releases: virt-manager 0.9.0: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.600.0: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.0.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.600.0.tar.gz The virt-manager release includes: - Use a hiding toolbar for fullscreen mode - Use libguestfs to show guest packagelist and more (Richard W.M. Jones) - Basic 'New VM' wizard support for LXC guests - Remote serial console access (with latest libvirt) - Remote URL guest installs (with latest libvirt) - Add Hardware: Support <filesystem> devices - Add Hardware: Support <smartcard> devices (Marc-André Lureau) - Enable direct interface selection for qemu/kvm (Gerhard Stenzel) - Allow viewing and changing disk serial number The virtinst release includes: - virt-install: Various improvements to enable LXC/container guests: - New --filesystem option for <filesystem> devices - New --init option for container <init> path - New --container option (similar to --paravirt or --hvm) - virt-install: Make --location remotely (with latest libvirt) - virt-install: New --smartcard option for <smartcard> devices (Marc-André Lureau) - virt-install: New --numatune option for building guest <numatune> XML - virt-install: option to set --disk error_policy= - virt-install: option to set --disk serial= Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

5 7

[libvirt] [PATCH] freebsd: Add gnulib environ module for the commandtest
by Matthias Bolte 02 Aug '11

02 Aug '11

--- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index f006a47..3b105b1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -36,6 +36,7 @@ configmake count-one-bits crypto/md5 dirname-lgpl +environ fclose fcntl-h ffs -- 1.7.4.1

3 5

[libvirt] [Libvirt] [PATCH v3] Fix bug #611823 prohibit pools with duplicate storage
by Lei Li 02 Aug '11

02 Aug '11

Make sure the unique storage pool defined and create from different directory to avoid inconsistent version of volume pool created. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 25 +++++++++++++++++++++++++ src/conf/storage_conf.h | 2 ++ src/libvirt_private.syms | 1 + 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 995f9a6..1d9fe25 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1317,6 +1317,21 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path) { + unsigned int i; + + for (i = 0 ; i < pools->count ; i++) { + virStoragePoolObjLock(pools->objs[i]); + if (STREQ(pools->objs[i]->def->target.path, path)) + return pools->objs[i]; + virStoragePoolObjUnlock(pools->objs[i]); + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1700,6 +1715,16 @@ int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, } } + /* Check the pool list if defined target path already exist */ + pool = virStoragePoolObjFindByPath(pools, def->target.path); + if (pool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("target path '%s' is already in use"), + pool->def->target.path); + dupPool = -1; + goto cleanup; + } + ret = dupPool; cleanup: if (pool) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..9239977 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 830222b..19f5f92 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -937,6 +937,7 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolObjFindByPath; virStoragePoolObjIsDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; -- 1.7.1

2 1

[libvirt] [PATCH] Fix bug #611823 prohibit pools with duplicate storage
by Lei Li 02 Aug '11

02 Aug '11

To make sure the unique storage pool defined and created from different directory to avoid inconsistent version of volume pool created, I add two API be called by storage driver to check for the probable duplicate pools and refused the duplicate pool. virStoragePoolObjFindByPath() provide a method to find pool object by target path in pool list. virStoragePoolTargetDuplicate() implement the function to check if there is duplicate pool. Add judgement for storagePoolCreate&storagePoolDefine by calling virStoragePoolTargetDuplicate() to avoid both transient storage pool and persistent storage pool be created repeatedly in storage driver. Signed-off-by: Lei Li<lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 39 +++++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 4 ++++ src/libvirt_private.syms | 2 ++ src/storage/storage_driver.c | 6 ++++++ 4 files changed, 51 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 995f9a6..a499e82 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1317,6 +1317,22 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path) +{ + unsigned int i; + + for (i = 0 ; i< pools->count ; i++) { + virStoragePoolObjLock(pools->objs[i]); + if (STREQ(pools->objs[i]->def->target.path, path)) + return pools->objs[i]; + virStoragePoolObjUnlock(pools->objs[i]); + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1707,6 +1723,29 @@ cleanup: return ret; } +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) +{ + int ret = 1; + virStoragePoolObjPtr pool = NULL; + + /*check pool list if defined target path already exist*/ + pool = virStoragePoolObjFindByPath(pools, def->target.path); + + if (pool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("target path '%s' is already in use"), + pool->def->target.path); + ret = -1; + goto cleanup; + } + + +cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} void virStoragePoolObjLock(virStoragePoolObjPtr obj) { diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..454c43d 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); @@ -387,6 +389,8 @@ char *virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def); int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, unsigned int check_active); +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); void virStoragePoolObjLock(virStoragePoolObjPtr obj); void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 853ee62..ef323f5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -930,7 +930,9 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolObjFindByPath; virStoragePoolObjIsDuplicate; +virStoragePoolTargetDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; virStoragePoolObjRemove; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9c353e3..8ee63f6 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -536,6 +536,9 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if ((backend = virStorageBackendForType(def->type)) == NULL) goto cleanup; @@ -589,6 +592,9 @@ storagePoolDefine(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if (virStorageBackendForType(def->type) == NULL) goto cleanup; -- 1.7.1

3 2

[libvirt] [PATCHv4 0/2] vnc/spice listen address as a network name
by Laine Stump 02 Aug '11

02 Aug '11

This is the latest reincarnation of this patch series: https://www.redhat.com/archives/libvir-list/2011-July/msg01717.html In the previous version, I had created a new subelement of <graphics>, called <listen>, and placed all listen address and port attributes there. After discussion on the list and in IRC with Dan Berrange and Eric Blake, I became convinced that was overdoing things, and that really only the address or network name should be in the <listen> element, but that port/tlsPort/autoport should stay put. This version removes all changes to port-related attributes, paring it down to just the listen address (and the new listen network) attribute. This greatly simplifies the patch, so new review of it should be easier. Based on Eric's review, the nwe version tries to be more concise about what is accepted, what is ignored, and what is rejected in the XML, both by the parser and by the RNG. (since there is less to deal with, this is also easier.) Having a single port value but multiple addresses does create some potential future restrictions, which we can deal with an eliminate later if they become problematic. In particular, each graphics device will have only a single port, but could have multiple listen addresses; in this case, all the listen addresses would have to listen on the same port. (This isn't a problem right now, because all of our drivers can only listen on a single address anyway). (Note to Eric: I did consider putting the switch to helper functions into its own patch, but after removing all the ports from <listen>, the number of helper functions (and thus the number of changes created by switching to using them, has been reduced considerably, so the gain wouldn't be as much. (also, it's very late, and I'd like to get some sleep tonight :-)

3 10

[libvirt] [PATCH] virsh: fix memory leak in cmdNetworkInfo
by ajia＠redhat.com 02 Aug '11

02 Aug '11

I have ever discussed this issue with Matthias, and he has fixed this leak in cmdNetworkInfo codes, but he hasn't committed a patch to upstream so that bug 722806 is always assigned status, so commit it to avoid this patch missing. * tools/virsh.c: avoid memory leak in cmdNetworkInfo. * how to reproduce? % valgrind -v --leak-check=yes virsh net-info default https://bugzilla.redhat.com/show_bug.cgi?id=722806 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 23e71d7..cf8e2a5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5597,6 +5597,7 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) if (bridge) vshPrint(ctl, "%-15s %s\n", _("Bridge:"), bridge); + VIR_FREE(bridge); virNetworkFree(network); return true; } -- 1.7.1

2 1

[libvirt] [PATCH] doc: fix incorrect option in blockjob
by ajia＠redhat.com 02 Aug '11

02 Aug '11

* tools/virsh.pod: change 'live' to 'abort' based on actual option. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index f6f9908..01b8fd6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -445,7 +445,7 @@ I<bandwidth> specifies copying bandwidth limit in Mbps. Manage active block operations. I<path> specifies fully-qualified path of the disk. -If I<--live> is specified, the active job on the specified disk will +If I<--abort> is specified, the active job on the specified disk will be aborted. If I<--info> is specified, the active job information on the specified disk will be printed. -- 1.7.1

2 1

[libvirt] [PATCH] openvz: detect when a domain was shut down from the inside
by Jean-Baptiste Rouault 01 Aug '11

01 Aug '11

This patch adds an internal function openvzGetVEStatus to get the real state of the domain. This function is used in various places in the driver, in particular to detect when the domain has been shut down by the user with the "halt" command. --- src/openvz/openvz_driver.c | 76 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 4e7cb03..3b3b079 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -72,6 +72,7 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm, unsigned int nvcpus); static int openvzDomainSetMemoryInternal(virDomainObjPtr vm, unsigned long memory); +static int openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason); static void openvzDriverLock(struct openvz_driver *driver) { @@ -340,6 +341,7 @@ static int openvzDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; + int state; int ret = -1; openvzDriverLock(driver); @@ -352,9 +354,11 @@ static int openvzDomainGetInfo(virDomainPtr dom, goto cleanup; } - info->state = virDomainObjGetState(vm, NULL); + if (openvzGetVEStatus(vm, &state, NULL) == -1) + goto cleanup; + info->state = state; - if (!virDomainObjIsActive(vm)) { + if (info->state != VIR_DOMAIN_RUNNING) { info->cpuTime = 0; } else { if (openvzGetProcessInfo(&(info->cpuTime), dom->id) < 0) { @@ -398,8 +402,7 @@ openvzDomainGetState(virDomainPtr dom, goto cleanup; } - *state = virDomainObjGetState(vm, reason); - ret = 0; + ret = openvzGetVEStatus(vm, state, reason); cleanup: if (vm) @@ -584,6 +587,7 @@ openvzDomainShutdownFlags(virDomainPtr dom, virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "stop", PROGRAM_SENTINAL, NULL}; int ret = -1; + int status; virCheckFlags(0, -1); @@ -596,9 +600,12 @@ openvzDomainShutdownFlags(virDomainPtr dom, _("no domain with matching uuid")); goto cleanup; } + + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; openvzSetProgramSentinal(prog, vm->def->name); - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + if (status != VIR_DOMAIN_RUNNING) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); goto cleanup; @@ -631,6 +638,7 @@ static int openvzDomainReboot(virDomainPtr dom, virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "restart", PROGRAM_SENTINAL, NULL}; int ret = -1; + int status; virCheckFlags(0, -1); @@ -644,8 +652,11 @@ static int openvzDomainReboot(virDomainPtr dom, goto cleanup; } + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + openvzSetProgramSentinal(prog, vm->def->name); - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + if (status != VIR_DOMAIN_RUNNING) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); goto cleanup; @@ -1052,6 +1063,7 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "start", PROGRAM_SENTINAL, NULL }; int ret = -1; + int status; virCheckFlags(0, -1); @@ -1064,8 +1076,11 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) _("no domain with matching id")); goto cleanup; } + + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_SHUTOFF) { + if (status != VIR_DOMAIN_SHUTOFF) { openvzError(VIR_ERR_OPERATION_DENIED, "%s", _("domain is not in shutoff state")); goto cleanup; @@ -1102,6 +1117,7 @@ openvzDomainUndefineFlags(virDomainPtr dom, virDomainObjPtr vm; const char *prog[] = { VZCTL, "--quiet", "destroy", PROGRAM_SENTINAL, NULL }; int ret = -1; + int status; virCheckFlags(0, -1); @@ -1113,7 +1129,10 @@ openvzDomainUndefineFlags(virDomainPtr dom, goto cleanup; } - if (virDomainObjIsActive(vm)) { + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + + if (status != VIR_DOMAIN_SHUTOFF) { openvzError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot delete active domain")); goto cleanup; @@ -1610,6 +1629,47 @@ cleanup: return -1; } +static int +openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason) +{ + virCommandPtr cmd; + char *outbuf; + char *line; + int state; + int ret = -1; + + cmd = virCommandNewArgList(VZLIST, vm->def->name, "-ostatus", "-H", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if ((line = strchr(outbuf, '\n')) == NULL) { + openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to parse vzlist output")); + goto cleanup; + } + *line++ = '\0'; + + state = virDomainObjGetState(vm, reason); + + if (STREQ(outbuf, "running")) { + // There is no way to detect whether a domain is paused or not with vzlist + if (state == VIR_DOMAIN_PAUSED) + *status = state; + else + *status = VIR_DOMAIN_RUNNING; + } else { + *status = VIR_DOMAIN_SHUTOFF; + } + + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + return ret; +} + static virDriver openvzDriver = { .no = VIR_DRV_OPENVZ, .name = "OPENVZ", -- 1.7.5.4

2 1

[libvirt] [PATCH RFC] virsh: Add option to undefine storage with domains
by Peter Krempa 01 Aug '11

01 Aug '11

Adds an option to virsh undefine command to undefine managed storage volumes along with (inactive) domains. Storage volumes are enumerated and the user may interactivly choose volumes to delete. Unmanaged volumes are listed and the user shall delete them manualy. --- I marked this as a RFC because I am concerned about my "naming scheme" of the added parameters. I couldn't decide which of the following "volumes/storage/disks/..." to use. I'd appreciate your comments on this. This is my second approach to this problem after I got some really good critique from Eric, Daniel and Dave. The user has the choice to activate an interactive mode, that allows to select on a per-device basis which volumes/disks to remove along with the domain. To avoid possible problems, I only allowed to remove storage for inactive domains and unmanaged images (which sidetracked me a lot on my previous attempt) are left to a action of the user. (the user is notified about any unmanaged image for the domain). My next concern is about interactive of the user. I tried to implement a boolean query function, but I'd like to know if I took the right path, as I couldn't find any example in virsh from which I could learn. Thanks for your comments (and time) :) Peter Krempa tools/virsh.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 259 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 61f69f0..3795d2b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -295,6 +295,9 @@ static int vshCommandOptULongLong(const vshCmd *cmd, const char *name, static bool vshCommandOptBool(const vshCmd *cmd, const char *name); static const vshCmdOpt *vshCommandOptArgv(const vshCmd *cmd, const vshCmdOpt *opt); +static int vshInteractiveBoolPrompt(vshControl *ctl, + const char *prompt, + bool *confirm); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) @@ -1422,6 +1425,8 @@ static const vshCmdInfo info_undefine[] = { static const vshCmdOptDef opts_undefine[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name or uuid")}, {"managed-save", VSH_OT_BOOL, 0, N_("remove domain managed state file")}, + {"disks", VSH_OT_BOOL, 0, N_("remove associated disk images managed in storage pools (interactive)")}, + {"disks-all", VSH_OT_BOOL, 0, N_("remove all associated disk images managed in storage pools")}, {NULL, 0, 0, NULL} }; @@ -1434,9 +1439,25 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) int id; int flags = 0; int managed_save = vshCommandOptBool(cmd, "managed-save"); + int remove_disks = vshCommandOptBool(cmd, "disks"); + int remove_all_disks = vshCommandOptBool(cmd, "disks-all"); int has_managed_save = 0; int rc = -1; + char *domxml; + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlXPathObjectPtr obj = NULL; + xmlNodePtr cur = NULL; + int i = 0; + char *source = NULL; + char *target = NULL; + char *type = NULL; + xmlBufferPtr xml_buf = NULL; + virStorageVolPtr volume = NULL; + int state; + bool confirm = false; + if (managed_save) flags |= VIR_DOMAIN_UNDEFINE_MANAGED_SAVE; @@ -1475,15 +1496,172 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) } } - if (flags == -1) { - if (has_managed_save == 1) { + + if (flags == -1 && has_managed_save == 1) { + vshError(ctl, + _("Refusing to undefine while domain managed save " + "image exists")); + virDomainFree(dom); + return false; + } + + if (remove_disks || remove_all_disks) { + if ((state = vshDomainState(ctl, dom, NULL)) < 0) { + vshError(ctl, _("Failed to get domain state")); + goto disk_error; + } + + /* removal of storage is possible only for inactive domains */ + if (!((state == VIR_DOMAIN_SHUTOFF) || + (state == VIR_DOMAIN_CRASHED))) { vshError(ctl, - _("Refusing to undefine while domain managed save " - "image exists")); - virDomainFree(dom); - return false; + _("Domain needs to be inactive to delete it with associated storage")); + goto disk_error; + } + + if (remove_disks && !ctl->imode) { + vshError(ctl, "%s\n", _("Option --disks is available only in interactive mode")); + goto disk_error; + } + + domxml = virDomainGetXMLDesc(dom, 0); + if (!domxml) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + xml = xmlReadDoc((const xmlChar *) domxml, "domain.xml", NULL, + XML_PARSE_NOENT | + XML_PARSE_NONET | + XML_PARSE_NOWARNING); + VIR_FREE(domxml); + + if (!xml) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + ctxt = xmlXPathNewContext(xml); + if (!ctxt) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); + if ((obj == NULL) || (obj->type != XPATH_NODESET) || + (obj->nodesetval == NULL)) { + vshError(ctl, "%s", _("Failed to get disk information")); + goto disk_error; + } + + for (i = 0; i < obj->nodesetval->nodeNr; i++) { + cur = obj->nodesetval->nodeTab[i]->children; + + type = virXMLPropString(cur, "device"); + + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "target")) + target = virXMLPropString(cur, "dev"); + else if (xmlStrEqual(cur->name, BAD_CAST "source")) + source = virXMLPropString(cur, "file"); + } + cur = cur->next; + } + + if (!source) { + VIR_FREE(target); + VIR_FREE(type); + } + + volume = virStorageVolLookupByPath(ctl->conn, (const char *) source); + if (!volume) { + vshPrint(ctl, "%s %s %s %s\n", + _("Volume: Source:"), (const char *)source, + _("Target:"), (const char *) target); + vshPrint(ctl, _("This volume isn't managed by any storage pool, " + "please delete it manualy\n\n")); + /* remove error indication */ + virFreeError(last_error); + last_error = NULL; + } else { + vshPrint(ctl, "%s %s %s %s\n", + _("Volume: Source:"), (const char *)source, + _("Target:"), (const char *) target); + + if (remove_all_disks) { + confirm = true; + } else { + if (vshInteractiveBoolPrompt(ctl, + _("Do you want to undefine this volume?"), + &confirm) < 0) { + vshError(ctl, _("\nError while geting response from user")); + virStorageVolFree(volume); + goto disk_error; + } + } + + /* removal of volume */ + if (confirm) { + if (virStorageVolDelete(volume, 0) == 0) { + virStorageVolFree(volume); + + vshPrint(ctl, _("Volume deleted\n\n")); + + /* remove definition of volume from xml */ + xml_buf = xmlBufferCreate(); + if (!xml_buf) { + vshPrint(ctl, _("Failed to create XML buffer. " + "If domain undefinition fails, domain will be left in inconsistent state.\n\n")); + goto disk_next; + } + + if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) { + vshPrint(ctl, _("Failed to extract XML volume description. " + "If domain undefinition fails, domain will be left in inconsistent state.\n\n")); + + xmlBufferFree(xml_buf); + xml_buf = NULL; + goto disk_next; + } + + if (virDomainDetachDeviceFlags(dom, + (char *) xmlBufferContent(xml_buf), + VIR_DOMAIN_AFFECT_CONFIG) < 0) { + vshPrint(ctl, + _("Failed to remove volume \"%s\" from configuration. " + "If domain undefinition fails, domain will be left in inconsistent state.\n\n"), + source); + + xmlBufferFree(xml_buf); + xml_buf = NULL; + goto disk_next; + } + + xmlBufferFree(xml_buf); + xml_buf = NULL; + + } else { + virStorageVolFree(volume); + + vshError(ctl, _("Failed to delete volume.")); + goto disk_error; + } + } + } + +disk_next: + VIR_FREE(source); + VIR_FREE(target); + VIR_FREE(type); } + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + } /* end of disk undefine stuff */ + + if (flags == -1) { rc = virDomainUndefine(dom); } else { rc = virDomainUndefineFlags(dom, flags); @@ -1520,6 +1698,21 @@ end: virDomainFree(dom); return ret; + +disk_error: + VIR_FREE(source); + VIR_FREE(target); + VIR_FREE(type); + + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + xmlBufferFree(xml_buf); + + virDomainFree(dom); + + vshError(ctl, _("\nFailed to undefine domain %s"), name); + return false; } @@ -14736,6 +14929,66 @@ vshReadline (vshControl *ctl, const char *prompt) #endif /* !USE_READLINE */ + +/* + * Propmpt for boolean question (yes/no) + * + * Returns "true" on positive answer, "false" on negative + * -1 on error. + */ +static int +vshInteractiveBoolPrompt(vshControl *ctl, + const char *prompt, + bool *confirm) { + const char *positive = _("yes"); + const char *negative = _("no"); + char *r; + char buff[100]; + int ret = -1; + int len; + int c; + + if (confirm == NULL) + return ret; + + if (!ctl->imode) + return ret; + + while (ret == -1) { + vshPrint(ctl, "%s (%s/%s)? ", prompt, positive, negative); + + r = fgets(buff, sizeof(buff), stdin); + if (r == NULL) + break; + len = strlen(buff); + if (len > 0 && buff[len-1] == '\n') + buff[len-1] = '\0'; + else + /* eat rest of line */ + while ((c = fgetc(stdin) != EOF)) + if (c == '\n') + break; + + /* compare */ + if (STRCASEEQLEN(buff, positive, strlen(positive))) { + ret = 0; + *confirm = true; + break; + } + + if (STRCASEEQLEN(buff, negative, strlen(negative))) { + ret = 0; + *confirm = false; + break; + } + + /* errorneus response - warn and ask again*/ + vshPrint(ctl, "\"%s\" %s\n", buff, _("Response not understood")); + + } + return ret; +} + /* * Deinitialize virsh */ -- 1.7.6

3 3

[libvirt] [PATCH] support qemuMonitorSend() to be called at the same time
by Wen Congyang 01 Aug '11

01 Aug '11

Current, we support run sync job and async job at the same time. It means that the monitor commands for two jobs can be run in any order. In the function qemuDomainObjEnterMonitorInternal(): if (priv->job.active == QEMU_JOB_NONE && priv->job.asyncJob) { if (qemuDomainObjBeginNestedJob(driver, obj) < 0) We check whether the caller is an async job by priv->job.active and priv->job.asynJob. But when an async job is running, priv->job.active is QEMU_JOB_NONE if no sync job is running, or priv->job.active is not QEMU_JOB_NONE if a sync job is running. So we cannot check whether the caller is an async job in the function qemuDomainObjEnterMonitorInternal(). Unfortunately, if sync job and async job are running at the same time, we may try to send monitor command at the same time in two threads. It's very dangerous, and it will cause libvirtd crashed. We should enhance the function qemuMonitorSend() to support it to be called at the same time. If the last monitor command does not finish, the other monitor commands should wait it to finish. --- src/qemu/qemu_monitor.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index db6107c..a10f53f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -46,6 +46,8 @@ struct _qemuMonitor { virMutex lock; /* also used to protect fd */ virCond notify; + virCond send_notify; + int refs; int fd; @@ -675,7 +677,8 @@ qemuMonitorOpen(virDomainObjPtr vm, VIR_FREE(mon); return NULL; } - if (virCondInit(&mon->notify) < 0) { + if ((virCondInit(&mon->notify) < 0) || + (virCondInit(&mon->send_notify) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize monitor condition")); virMutexDestroy(&mon->lock); @@ -795,6 +798,22 @@ int qemuMonitorSend(qemuMonitorPtr mon, return -1; } + while (mon->msg) { + if (virCondWait(&mon->send_notify, &mon->lock) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to wait on monitor condition")); + goto cleanup; + } + } + + /* Check whether qemu quited unexpectedly again */ + if (mon->lastError.code != VIR_ERR_OK) { + VIR_DEBUG("Attempt to send command while error is set %s", + NULLSTR(mon->lastError.message)); + virSetError(&mon->lastError); + return -1; + } + mon->msg = msg; qemuMonitorUpdateWatch(mon); @@ -818,6 +837,7 @@ int qemuMonitorSend(qemuMonitorPtr mon, cleanup: mon->msg = NULL; qemuMonitorUpdateWatch(mon); + virCondBroadcast(&mon->send_notify); return ret; } -- 1.7.1

3 11

[libvirt] [PATCH] daemon: Unlink unix socket paths on shutdown
by Osier Yang 01 Aug '11

01 Aug '11

This patch introduces a internal RPC API "virNetServerClose", which is standalone with "virNetServerFree". it closes all the socket fds, and unlinks the unix socket paths, regardless of whether the socket is still referenced or not. This is to address regression bug: https://bugzilla.redhat.com/show_bug.cgi?id=725702 --- daemon/libvirtd.c | 1 + src/rpc/virnetserver.c | 12 ++++++++++++ src/rpc/virnetserver.h | 1 + src/rpc/virnetserverservice.c | 12 ++++++++++++ src/rpc/virnetserverservice.h | 2 ++ src/rpc/virnetsocket.c | 16 ++++++++++++++++ src/rpc/virnetsocket.h | 2 ++ 7 files changed, 46 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 9e044e2..53f1002 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1558,6 +1558,7 @@ int main(int argc, char **argv) { cleanup: virNetServerProgramFree(remoteProgram); virNetServerProgramFree(qemuProgram); + virNetServerClose(srv); virNetServerFree(srv); if (statuswrite != -1) { if (ret != 0) { diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 2dae2ff..d2a6fef 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -794,3 +794,15 @@ void virNetServerFree(virNetServerPtr srv) virMutexDestroy(&srv->lock); VIR_FREE(srv); } + +void virNetServerClose(virNetServerPtr srv) +{ + int i; + + if (!srv) + return; + + for (i = 0; i < srv->nservices; i++) { + virNetServerServiceClose(srv->services[i]); + } +} diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 810d8a3..324cfb7 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -85,5 +85,6 @@ void virNetServerQuit(virNetServerPtr srv); void virNetServerFree(virNetServerPtr srv); +void virNetServerClose(virNetServerPtr srv); #endif diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index d5648dc..8c9ed1e 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -280,3 +280,15 @@ void virNetServerServiceToggle(virNetServerServicePtr svc, VIR_EVENT_HANDLE_READABLE : 0); } + +void virNetServerServiceClose(virNetServerServicePtr svc) +{ + int i; + + if (!svc) + return; + + for (i = 0; i < svc->nsocks; i++) { + virNetSocketClose(svc->socks[i]); + } +} diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index 9357598..8540bd9 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -66,4 +66,6 @@ void virNetServerServiceFree(virNetServerServicePtr svc); void virNetServerServiceToggle(virNetServerServicePtr svc, bool enabled); +void virNetServerServiceClose(virNetServerServicePtr svc); + #endif diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 41b691a..b94b629 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1222,3 +1222,19 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock) virMutexUnlock(&sock->lock); } + +void virNetSocketClose(virNetSocketPtr sock) +{ + if (!sock) + return; + + VIR_FORCE_CLOSE(sock->fd); + +#ifdef HAVE_SYS_UN_H + /* If a server socket, then unlink UNIX path */ + if (!sock->client && + sock->localAddr.data.sa.sa_family == AF_UNIX && + sock->localAddr.data.un.sun_path[0] != '\0') + unlink(sock->localAddr.data.un.sun_path); +#endif +} diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index dfb3c5d..3735a88 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -118,6 +118,8 @@ void virNetSocketUpdateIOCallback(virNetSocketPtr sock, void virNetSocketRemoveIOCallback(virNetSocketPtr sock); +void virNetSocketClose(virNetSocketPtr sock); + #endif /* __VIR_NET_SOCKET_H__ */ -- 1.7.6

2 5

[libvirt] [PATCH v2] qemu: fix return value issue
by ajia＠redhat.com 01 Aug '11

01 Aug '11

whether or not previous return value is -1, the following codes will be executed for a inactive guest in src/qemu/qemu_driver.c: ret = virDomainSaveConfig(driver->configDir, persistentDef); and if everything is okay, 'ret' is assigned to 0, the previous 'ret' will be overwritten, this patch will fix this issue. * src/qemu/qemu_driver.c: avoid return value is overwritten when give a argument in out of blkio weight range for a inactive guest. * how to reproduce? % virsh blkiotune ${guestname} --weight 10 % echo $? Note: guest must be inactive, argument 10 in out of blkio weight range, and can get a error information by checking libvirtd.log, however, virsh hasn't raised any error information, and return value is 0. https://bugzilla.redhat.com/show_bug.cgi?id=726304 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b673fd5..aaccddf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5688,7 +5688,9 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; } } - ret = virDomainSaveConfig(driver->configDir, persistentDef); + + if (virDomainSaveConfig(driver->configDir, persistentDef) < 0) + ret = -1; } cleanup: -- 1.7.1

2 1

[libvirt] [PATCH v2] qemu: fix return value issue in qemuDomainSetMemoryParameters
by ajia＠redhat.com 01 Aug '11

01 Aug '11

whether or not previous return value is -1, the following codes will be executed for a inactive guest in qemuDomainSetMemoryParameters: ret = virDomainSaveConfig(driver->configDir, persistentDef); and if everything is okay, 'ret' is assigned to 0, the previous 'ret' will be overwritten, this patch will fix this issue. * src/qemu/qemu_driver.c: avoid return value is overwritten when set min_guarante value to a inactive guest. * how to reproduce? % virsh memtune ${guestname} --min_guarante 1024 % echo $? Note: guest must be inactive, in fact, 'min_guarante' hasn't been implemented in memory tunable, and I can get the error when check actual libvirtd.log, however, virsh hasn't raised any error information, and return value is 0. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cce1c68..cb5108d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5983,7 +5983,8 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - ret = virDomainSaveConfig(driver->configDir, persistentDef); + if(virDomainSaveConfig(driver->configDir, persistentDef) < 0) + ret = -1; } cleanup: -- 1.7.1

3 2

[libvirt] [PATCH] qemu: fix return value issue
by ajia＠redhat.com 01 Aug '11

01 Aug '11

whether or not previous return value is -1, the following codes will be executed for a inactive guest in src/qemu/qemu_driver.c: ret = virDomainSaveConfig(driver->configDir, persistentDef); and if everything is okay, 'ret' is assigned to 0, the previous 'ret' will be overwritten, this patch will fix this issue. * src/qemu/qemu_driver.c: avoid return value is overwritten when give a argument in out of blkio weight range for a inactive guest. * how to reproduce? % virsh blkiotune ${guestname} --weight 10 % echo $? Note: guest must be inactive, argument 10 in out of blkio weight range, however, virsh hasn't raised any error information, and return value is 0. https://bugzilla.redhat.com/show_bug.cgi?id=726304 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b673fd5..aaccddf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5688,7 +5688,9 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; } } - ret = virDomainSaveConfig(driver->configDir, persistentDef); + + if(virDomainSaveConfig(driver->configDir, persistentDef) < 0) + goto cleanup; } cleanup: -- 1.7.1

3 2

[libvirt] [PATCH] virsh: Fix vol-name and vol-pool commands
by Matthias Bolte 01 Aug '11

01 Aug '11

This commands don't have a --pool option, so don't tell vshCommandOptVolBy that there could be one. This made vshCommandOptString for pooloptname fail and an "missing option" error was reported. Make pooloptname optional for vshCommandOptVolBy. --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 9e0744d..5fcf370 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9201,7 +9201,7 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (!(vol = vshCommandOptVolBy(ctl, cmd, "vol", "pool", NULL, + if (!(vol = vshCommandOptVolBy(ctl, cmd, "vol", NULL, NULL, VSH_BYUUID))) return false; @@ -9238,7 +9238,7 @@ cmdVolPool(vshControl *ctl, const vshCmd *cmd) return false; /* Use the supplied string to locate the volume */ - if (!(vol = vshCommandOptVolBy(ctl, cmd, "vol", "pool", NULL, + if (!(vol = vshCommandOptVolBy(ctl, cmd, "vol", NULL, NULL, VSH_BYUUID))) { return false; } @@ -13619,7 +13619,7 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - if (vshCommandOptString(cmd, pooloptname, &p) < 0) { + if (pooloptname != NULL && vshCommandOptString(cmd, pooloptname, &p) < 0) { vshError(ctl, "%s", _("missing option")); return NULL; } -- 1.7.4.1

2 2

[libvirt] [PATCH] Correct the default value of lock_manager in qemu.conf
by Guannan Ren 01 Aug '11

01 Aug '11

* src/qemu/qemu.conf lock_manager = "sanlock" --- src/qemu/qemu.conf | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 8058352..79c6e85 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -304,9 +304,8 @@ # # max_processes = 0 -# To enable strict 'fcntl' based locking of the file +# To enable 'Sanlock' project based locking of the file # content (to prevent two VMs writing to the same -# disk), start the 'virtlockd' service, and uncomment -# this +# disk), uncomment this # -# lock_manager = "fcntl" +# lock_manager = "sanlock" -- 1.7.1

2 1

[libvirt] [PATCH] qemu: Fix a regression of domjobabort
by Osier Yang 01 Aug '11

01 Aug '11

Introduced by f9a837da73a11ef, the condition is not changed after the else clause is removed. So now it quit with "domain is not running" when the domain is running. However, when the domain is not running, it reports "no job is active". How to reproduce: 1) % virsh start $domain % virsh domjobabort $domain error: Requested operation is not valid: domain is not running 2) % virsh destroy $domain % virsh domjobabort $domain error: Requested operation is not valid: no job is active on the domain 3) % virsh save $domain /tmp/$domain.save Before above commands finished, try to abort job in another terminal % virsh domabortjob $domain error: Requested operation is not valid: domain is not running --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b673fd5..cce1c68 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8065,7 +8065,7 @@ static int qemuDomainAbortJob(virDomainPtr dom) { if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_ABORT) < 0) goto cleanup; - if (virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm)) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; -- 1.7.6

2 2

[libvirt] [PATCH] qemu: fix return value issue in qemuDomainSetMemoryParameters
by ajia＠redhat.com 01 Aug '11

01 Aug '11

whether or not previous return value is -1, the following codes will be executed for a inactive guest in qemuDomainSetMemoryParameters: ret = virDomainSaveConfig(driver->configDir, persistentDef); and if everything is okay, 'ret' is assigned to 0, the previous 'ret' will be overwritten, this patch will fix this issue. * src/qemu/qemu_driver.c: avoid return value is overwritten when set min_guarante value to a inactive guest. * how to reproduce? % virsh memtune ${guestname} --min_guarante 1024 % echo $? Note: guest must be inactive, in fact, 'min_guarante' hasn't been implemented in memory tunable, and I can get the error when check actual libvirtd.log, however, virsh hasn't raised any error information, and return value is 0. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b673fd5..a099723 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5983,7 +5983,8 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - ret = virDomainSaveConfig(driver->configDir, persistentDef); + if(virDomainSaveConfig(driver->configDir, persistentDef) < 0) + goto cleanup; } cleanup: -- 1.7.1

1 0

[libvirt] [PATCH] conf: Don't leak the virtual port profile in virNetworkDefFree
by Matthias Bolte 01 Aug '11

01 Aug '11

Reported by Alex Jia. --- src/conf/network_conf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6714c20..b11c482 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -169,6 +169,8 @@ void virNetworkDefFree(virNetworkDefPtr def) virNetworkDNSDefFree(def->dns); + VIR_FREE(def->virtPortProfile); + virBandwidthDefFree(def->bandwidth); VIR_FREE(def); -- 1.7.4.1

2 2

[libvirt] ANNOUNCE: Guest filesystem browser (guestfs-browser) 0.2.1 released
by Richard W.M. Jones 30 Jul '11

30 Jul '11

The guest filesystem browser lets you browse guest filesystems, the Windows Registry, and other bits from guests. You can see some screenshots here: https://rwmj.wordpress.com/2011/07/29/some-screenshots-from-the-new-guest-f… The 0.2.1 release includes lots of new functionality, including: - looking at inspection data, applications, drive mappings and more - looking at detailed file information, extended attrs - ability to view arbitrary disk images The home page is here: http://people.redhat.com/~rjones/guestfs-browser/ I have pushed relatively recent builds into Fedora 15, Fedora 16 and Rawhide. For F15 and F16 you'll need to get the latest from updates-testing: https://admin.fedoraproject.org/updates/search/guestfs-browser Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

1 0

[libvirt] compile error: cannot open < gnulib/lib/gnulib.mk: No such file or directory
by ajia 30 Jul '11

30 Jul '11

Hi all, When I get latest libvirt and then runnning make && make install, I met the following error: # make && make install INFO: gnulib update required; running ./autogen.sh first CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/sh /root/libvirt/build-aux/missing --run aclocal-1.11 -I m4 -I gnulib/m4 cd . && /bin/sh /root/libvirt/build-aux/missing --run automake-1.11 --gnu automake-1.11: cannot open < gnulib/lib/gnulib.mk: No such file or directory make: *** [Makefile.in] Error 1 Has anybody met this issue recently? BTW, my current commit id is a8be259d0cca071c5735c70580c247e9b44b2ebd. Thanks, Alex

3 4

[libvirt] Changing device owner
by Shahar Havivi 30 Jul '11

30 Jul '11

Alex, Regarding vdsm changing a device owner, Last time I asked in #virt for using usb device in vdsm hook in /dev/bus/usb/<addr> I was told that vdsm should change the owner to qemu:kvm. So for the sr-iov device /sys/bus/pci/devices/<addr>/resource*, rom, and reset libvirt should change the owner and not vdsm? Shahar Havivi.

2 3

[libvirt] [PATCH] Fix bug #611823 prohibit pools with duplicate storage
by Lei Li 30 Jul '11

30 Jul '11

Make sure the unique storage pool defined and create from different directory to avoid inconsistent version of volume pool created. Signed-off-by: Lei Li<lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 36 ++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 4 ++++ src/libvirt_private.syms | 2 ++ src/storage/storage_driver.c | 6 ++++++ 4 files changed, 48 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 995f9a6..9078f78 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1317,6 +1317,21 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path) { + unsigned int i; + + for (i = 0 ; i< pools->count ; i++) { + virStoragePoolObjLock(pools->objs[i]); + if (STREQ(pools->objs[i]->def->target.path, path)) + return pools->objs[i]; + virStoragePoolObjUnlock(pools->objs[i]); + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1707,6 +1722,27 @@ cleanup: return ret; } +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) +{ + int ret = 1; + virStoragePoolObjPtr pool = NULL; + + /* Check the pool list if defined target path already exist */ + pool = virStoragePoolObjFindByPath(pools, def->target.path); + if (pool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("target path '%s' is already in use"), + pool->def->target.path); + ret = -1; + goto cleanup; + } + +cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} void virStoragePoolObjLock(virStoragePoolObjPtr obj) { diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..454c43d 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); @@ -387,6 +389,8 @@ char *virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def); int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, unsigned int check_active); +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); void virStoragePoolObjLock(virStoragePoolObjPtr obj); void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 830222b..37afaf2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -937,7 +937,9 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolObjFindByPath; virStoragePoolObjIsDuplicate; +virStoragePoolTargetDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; virStoragePoolObjRemove; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9c353e3..b757911 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -536,6 +536,9 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if ((backend = virStorageBackendForType(def->type)) == NULL) goto cleanup; @@ -589,6 +592,9 @@ storagePoolDefine(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if (virStorageBackendForType(def->type) == NULL) goto cleanup; -- 1.7.1

1 0

[libvirt] [PATCH] Fix bug#611823 prohibit pools with duplicate storage
by Lei Li 30 Jul '11

30 Jul '11

Make sure the unique storage pool defined and create from different directory to avoid inconsistent version of volume pool created. Signed-off-by: Lei Li<lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 36 ++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 5 +++++ src/libvirt_private.syms | 2 ++ src/storage/storage_driver.c | 6 ++++++ 4 files changed, 49 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 995f9a6..eb3595c 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1317,6 +1317,21 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path) { + unsigned int i; + + for (i = 0 ; i< pools->count ; i++) { + virStoragePoolObjLock(pools->objs[i]); + if (STREQ(pools->objs[i]->def->target.path, path)) + return pools->objs[i]; + virStoragePoolObjUnlock(pools->objs[i]); + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1707,6 +1722,27 @@ cleanup: return ret; } +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) +{ + int ret = 1; + virStoragePoolObjPtr pool = NULL; + + /* Check the pool list if defined target path already exist */ + pool = virStoragePoolObjFindByPath(pools, def->target.path); + if (pool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("target path '%s' is already in use"), + pool->def->target.path); + ret = -1; + goto cleanup; + } + +cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} void virStoragePoolObjLock(virStoragePoolObjPtr obj) { diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..44a2cc8 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolObjFindByPath(virStoragePoolObjListPtr pools, + const char *path); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); @@ -388,6 +390,9 @@ int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, unsigned int check_active); +int virStoragePoolTargetDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); + void virStoragePoolObjLock(virStoragePoolObjPtr obj); void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 830222b..37afaf2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -937,7 +937,9 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolObjFindByPath; virStoragePoolObjIsDuplicate; +virStoragePoolTargetDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; virStoragePoolObjRemove; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9c353e3..b757911 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -536,6 +536,9 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if ((backend = virStorageBackendForType(def->type)) == NULL) goto cleanup; @@ -589,6 +592,9 @@ storagePoolDefine(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0)< 0) goto cleanup; + if (virStoragePoolTargetDuplicate(&driver->pools, def)< 0) + goto cleanup; + if (virStorageBackendForType(def->type) == NULL) goto cleanup; -- 1.7.1

1 0

[libvirt] [PATCHv4 1/2] conf: make 'vnet' prefix a macro
by Eric Blake 29 Jul '11

29 Jul '11

Using a macro ensures that all the code is looking for the same prefix. * src/conf/domain_conf.h (VIR_NET_GENERATED_PREFIX): New macro. * src/conf/domain_conf.c (virDomainNetDefParseXML): Use it. * src/uml/uml_conf.c (umlConnectTapDevice): Likewise. * src/qemu/qemu_command.c (qemuNetworkIfaceConnect): Likewise. Suggested by Laine Stump. --- v4: new patch src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_command.c | 8 ++++---- src/uml/uml_conf.c | 8 ++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 257a1ea..72eccde 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2819,7 +2819,7 @@ virDomainNetDefParseXML(virCapsPtr caps, ifname = virXMLPropString(cur, "dev"); if ((ifname != NULL) && ((flags & VIR_DOMAIN_XML_INACTIVE) && - (STRPREFIX((const char*)ifname, "vnet")))) { + (STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX)))) { /* An auto-generated target name, blank it out */ VIR_FREE(ifname); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c748f52..dd33eb0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -429,6 +429,10 @@ struct _virDomainNetDef { virBandwidthPtr bandwidth; }; +/* Used for prefix of ifname of any network name generated dynamically + * by libvirt, and cannot be used for a persistent network name. */ +# define VIR_NET_GENERATED_PREFIX "vnet" + enum virDomainChrDeviceType { VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL = 0, VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ee42f1d..6a2e2ae 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -188,7 +188,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, int err; int tapfd = -1; int vnet_hdr = 0; - int template_ifname = 0; + bool template_ifname = false; unsigned char tapmac[VIR_MAC_BUFLEN]; int actualType = virDomainNetGetActualType(net); @@ -244,15 +244,15 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } if (!net->ifname || - STRPREFIX(net->ifname, "vnet") || + STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (!(net->ifname = strdup("vnet%d"))) { + if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d"))) { virReportOOMError(); goto cleanup; } /* avoid exposing vnet%d in getXMLDesc or error outputs */ - template_ifname = 1; + template_ifname = true; } if (qemuCapsGet(qemuCaps, QEMU_CAPS_VNET_HDR) && diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 417271e..7b5e094 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -115,7 +115,7 @@ umlConnectTapDevice(virConnectPtr conn, const char *bridge) { brControl *brctl = NULL; - int template_ifname = 0; + bool template_ifname = false; int err; unsigned char tapmac[VIR_MAC_BUFLEN]; @@ -126,13 +126,13 @@ umlConnectTapDevice(virConnectPtr conn, } if (!net->ifname || - STRPREFIX(net->ifname, "vnet") || + STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (!(net->ifname = strdup("vnet%d"))) + if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d"))) goto no_memory; /* avoid exposing vnet%d in getXMLDesc or error outputs */ - template_ifname = 1; + template_ifname = true; } memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); -- 1.7.4.4

2 4

[libvirt] [PATCH] network: don't forward DNS requests from isolated networks
by Laine Stump 29 Jul '11

29 Jul '11

This is in response to: https://bugzilla.redhat.com/show_bug.cgi?id=723862 which points out that a guest on an "isolated" network could potentially exploit the DNS forwarding provided by dnsmasq to create a communication channel to the outside. This patch eliminates that possibility by adding the "--no-resolv" argument to the dnsmasq commandline, which tells dnsmasq to not forward on any requests that it can't resolv itself (by looking at its own static hosts files and runtime lsit of dhcp clients), but to instead return a failure for those requests. This shouldn't cause any undesirable change from current behavior, even in the case where a guest is currently configured with multiple interfaces, one of them being connected to an isolated network, and another to a network that does have connectivity to the outside. If the isolated network's DNS server is queried for a name it doesn't know, it will return "Refused" rather than "Unknown", which indicates to the guest that it should query other servers, so it then queries the connected DNS server, and gets the desired response. --- src/network/bridge_driver.c | 11 ++++++++--- tests/networkxml2argvdata/isolated-network.argv | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b8c6c97..0a60bb8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -531,10 +531,15 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, /* If this is an isolated network, set the default route option * (3) to be empty to avoid setting a default route that's - * guaranteed to not work. + * guaranteed to not work, and set --no-resolv so that no dns + * requests are forwarded on to the dns server listed in the + * host's /etc/resolv.conf (since this could be used as a channel + * to build a connection to the outside). */ - if (network->def->forwardType == VIR_NETWORK_FORWARD_NONE) - virCommandAddArg(cmd, "--dhcp-option=3"); + if (network->def->forwardType == VIR_NETWORK_FORWARD_NONE) { + virCommandAddArgList(cmd, "--dhcp-option=3", + "--no-resolv", NULL); + } if (network->def->dns != NULL) { virNetworkDNSDefPtr dns = network->def->dns; diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index f801396..7ea2e94 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,5 +1,6 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ ---except-interface lo --dhcp-option=3 --listen-address 192.168.152.1 \ +--except-interface lo --dhcp-option=3 --no-resolv \ +--listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ --dhcp-no-override\ -- 1.7.3.4

2 2

[libvirt] [PATCH] build: fix include path for cygwin
by Eric Blake 29 Jul '11

29 Jul '11

Without this, cygwin failed to compile: In file included from ../src/rpc/virnetmessage.h:24, from ../src/rpc/virnetclient.h:27, from remote/remote_driver.c:31: ../src/rpc/virnetprotocol.h:9:21: error: rpc/rpc.h: No such file or directory With that fixed, compilation warned: rpc/virnetsocket.c: In function 'virNetSocketNewListenUNIX': rpc/virnetsocket.c:347: warning: format '%d' expects type 'int', but argument 8 has type 'gid_t' [-Wformat] rpc/virnetsocket.c: In function 'virNetSocketGetLocalIdentity': rpc/virnetsocket.c:743: warning: pointer targets in passing argument 5 of 'getsockopt' differ in signedness * src/Makefile.am (libvirt_driver_remote_la_CFLAGS) (libvirt_net_rpc_client_la_CFLAGS) (libvirt_net_rpc_server_la_CFLAGS): Include XDR_CFLAGS, for rpc headers on cygwin. * src/rpc/virnetsocket.c (virNetSocketNewListenUNIX) (virNetSocketGetLocalIdentity): Avoid compiler warnings. --- Pushing under the build-breaker rule. src/Makefile.am | 5 ++++- src/rpc/virnetsocket.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b7e4991..009ff25 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -578,6 +578,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la endif libvirt_driver_remote_la_CFLAGS = \ $(GNUTLS_CFLAGS) \ + $(XDR_CFLAGS) \ -I@top_srcdir@/src/conf \ -I@top_srcdir@/src/rpc \ $(AM_CFLAGS) @@ -1293,6 +1294,7 @@ EXTRA_DIST += \ endif libvirt_net_rpc_server_la_CFLAGS = \ $(AVAHI_CFLAGS) \ + $(XDR_CFLAGS) \ $(AM_CFLAGS) \ $(POLKIT_CFLAGS) libvirt_net_rpc_server_la_LDFLAGS = \ @@ -1309,7 +1311,8 @@ libvirt_net_rpc_client_la_SOURCES = \ rpc/virnetclientstream.h rpc/virnetclientstream.c \ rpc/virnetclient.h rpc/virnetclient.c libvirt_net_rpc_client_la_CFLAGS = \ - $(AM_CFLAGS) + $(AM_CFLAGS) \ + $(XDR_CFLAGS) libvirt_net_rpc_client_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index dcdc937..41b691a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -345,8 +345,8 @@ int virNetSocketNewListenUNIX(const char *path, */ if (grp != 0 && chown(path, -1, grp)) { virReportSystemError(errno, - _("Failed to change group ID of '%s' to %d"), - path, grp); + _("Failed to change group ID of '%s' to %u"), + path, (unsigned int) grp); goto error; } @@ -737,7 +737,7 @@ int virNetSocketGetLocalIdentity(virNetSocketPtr sock, pid_t *pid) { struct ucred cr; - unsigned int cr_len = sizeof (cr); + socklen_t cr_len = sizeof (cr); virMutexLock(&sock->lock); if (getsockopt(sock->fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) { -- 1.7.4.4

1 0

[libvirt] [PATCH] build: avoid non-portable shell in test setup
by Eric Blake 29 Jul '11

29 Jul '11

POSIX states that 'a=1; a=2 b=$a command' has unspecified results for the value of $b visible within command. In particular, on BSD, this resulted in PATH not picking up the in-test ssh. * tests/Makefile.am (lv_abs_top_builddir): New macro. (path_add, TESTS_ENVIRONMENT): Use it to avoid referring to an environment variable set previously within the same command line. Reported by Matthias Bolte. --- Spotted by inspection based on an IRC report; hopefully someone on BSD can test if it actually makes a difference. tests/Makefile.am | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 43a4301..f4afcb9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -259,13 +259,17 @@ TESTS += interfacexml2xmltest TESTS += cputest -path_add = $$abs_top_builddir/daemon$(PATH_SEPARATOR)$$abs_top_builddir/tools$(PATH_SEPARATOR)$$abs_top_builddir/tests - # NB, automake < 1.10 does not provide the real # abs_top_{src/build}dir or builddir variables, so don't rely # on them here. Fake them with 'pwd' +# Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an +# intermediate shell variable, but must do all the expansion in make + +lv_abs_top_builddir=`cd '$(top_builddir)'; pwd` +path_add = $(lv_abs_top_builddir)/daemon$(PATH_SEPARATOR)$(lv_abs_top_builddir)/tools$(PATH_SEPARATOR)$(lv_abs_top_builddir)/tests + TESTS_ENVIRONMENT = \ - abs_top_builddir=`cd '$(top_builddir)'; pwd` \ + abs_top_builddir=$(lv_abs_top_builddir) \ abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \ abs_builddir=`pwd` \ abs_srcdir=`cd '$(srcdir)'; pwd` \ -- 1.7.4.4

2 2

Re: [libvirt] How to connect to the running VM
by Dave Allan 29 Jul '11

29 Jul '11

On Fri, Jul 29, 2011 at 10:36:48AM -0700, bala suru wrote: > Hi, > Can you suggest any links /docs which explain the kvm image creation steps > ..? Replying on list for the benefit of everyone. I don't know what you're referring to when you say kvm image. Are you asking how to install the OS in the guest? Dave > rgds > > On Fri, Jul 29, 2011 at 9:17 AM, Dave Allan <dallan(a)redhat.com> wrote: > > > On Fri, Jul 29, 2011 at 05:06:06PM +0530, bala suru wrote: > > > Hi, > > > I have deployed some VM on to the KVM-qemu and installed libvirtd .. > > > > > > I could see the VM running by command virsh list . > > > > > > but how to login to the VMs other than SSH ..? i tried virsh vncdisplay , > > > but no output .. > > > > virt-viewer <name of VM> > > > > will give you the graphical console if you have one set up. > > > > virt-manager gives you both graphical console and a graphical > > interface to configure the VM. > > > > Dave > > > > > regards > > > bala > > > > > -- > > > libvir-list mailing list > > > libvir-list(a)redhat.com > > > https://www.redhat.com/mailman/listinfo/libvir-list > > > >

1 0

[libvirt] [PATCHv3 1/3] save: support qemu modifying xml on domain save/restore
by Eric Blake 29 Jul '11

29 Jul '11

With this, it is possible to update the path to a disk backing image on either the save or restore action, without having to binary edit the XML embedded in the state file. This also modifies virDomainSave to output a smaller xml (only the inactive xml, which is all the more virDomainRestore parses), while still guaranteeing padding for most typical abi-compatible xml replacements, necessary so that the next patch for virDomainSaveImageDefineXML will not cause unnecessary modifications to the save image file. * src/qemu/qemu_driver.c (qemuDomainSaveInternal): Add parameter, only use inactive state, and guarantee padding. (qemuDomainSaveImageOpen): Add parameter. (qemuDomainSaveFlags, qemuDomainManagedSave) (qemuDomainRestoreFlags, qemuDomainObjRestore): Update callers. --- v3: change virDomainSave to always output minimal information, but with fixed padding added, so that save file modification will always be more likely to succeed, and not generate quite as many xml differences on round trips. src/qemu/qemu_driver.c | 109 +++++++++++++++++++++++++++++------------------ 1 files changed, 67 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1401967..2b1df6c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2193,7 +2193,7 @@ qemuCompressProgramName(int compress) static int qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, virDomainObjPtr vm, const char *path, - int compressed, bool bypass_cache) + int compressed, bool bypass_cache, const char *xmlin) { char *xml = NULL; struct qemud_save_header header; @@ -2204,7 +2204,9 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, qemuDomainObjPrivatePtr priv; struct stat sb; bool is_reg = false; + size_t len; unsigned long long offset; + unsigned long long pad; int fd = -1; uid_t uid = getuid(); gid_t gid = getgid(); @@ -2239,15 +2241,54 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, } } - /* Get XML for the domain */ - xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); + /* Get XML for the domain. Restore needs only the inactive xml, + * including secure. We should get the same result whether xmlin + * is NULL or whether it was the live xml of the domain moments + * before. */ + if (xmlin) { + virDomainDefPtr def = NULL; + + if (!(def = virDomainDefParseString(driver->caps, xmlin, + QEMU_EXPECTED_VIRT_TYPES, + VIR_DOMAIN_XML_INACTIVE))) { + goto endjob; + } + if (!virDomainDefCheckABIStability(vm->def, def)) { + virDomainDefFree(def); + goto endjob; + } + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); + } else { + xml = virDomainDefFormat(vm->def, (VIR_DOMAIN_XML_INACTIVE | + VIR_DOMAIN_XML_SECURE)); + } if (!xml) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to get domain xml")); goto endjob; } - header.xml_len = strlen(xml) + 1; + len = strlen(xml) + 1; + offset = sizeof(header) + len; + + /* Due to way we append QEMU state on our header with dd, + * we need to ensure there's a 512 byte boundary. Unfortunately + * we don't have an explicit offset in the header, so we fake + * it by padding the XML string with NUL bytes. Additionally, + * we want to ensure that virDomainSaveImageDefineXML can supply + * slightly larger XML, so we add a miminum padding prior to + * rounding out to page boundaries. + */ + pad = 1024; + pad += (QEMU_MONITOR_MIGRATE_TO_FILE_BS - + ((offset + pad) % QEMU_MONITOR_MIGRATE_TO_FILE_BS)); + if (VIR_EXPAND_N(xml, len, pad) < 0) { + virReportOOMError(); + goto endjob; + } + offset += pad; + header.xml_len = len; + /* Obtain the file handle. */ /* path might be a pre-existing block dev, in which case * we need to skip the create step, and also avoid unlink * in the failure case */ @@ -2268,29 +2309,6 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, } } - offset = sizeof(header) + header.xml_len; - - /* Due to way we append QEMU state on our header with dd, - * we need to ensure there's a 512 byte boundary. Unfortunately - * we don't have an explicit offset in the header, so we fake - * it by padding the XML string with NULLs. - */ - if (offset % QEMU_MONITOR_MIGRATE_TO_FILE_BS) { - unsigned long long pad = - QEMU_MONITOR_MIGRATE_TO_FILE_BS - - (offset % QEMU_MONITOR_MIGRATE_TO_FILE_BS); - - if (VIR_REALLOC_N(xml, header.xml_len + pad) < 0) { - virReportOOMError(); - goto endjob; - } - memset(xml + header.xml_len, 0, pad); - offset += pad; - header.xml_len += pad; - } - - /* Obtain the file handle. */ - /* First try creating the file as root */ if (bypass_cache) { directFlag = virFileDirectFdFlag(); @@ -2461,11 +2479,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, virDomainObjPtr vm = NULL; virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE, -1); - if (dxml) { - qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); - return -1; - } qemuDriverLock(driver); @@ -2503,7 +2516,8 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, } ret = qemuDomainSaveInternal(driver, dom, vm, path, compressed, - (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0); + (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0, + dxml); vm = NULL; cleanup: @@ -2567,7 +2581,8 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) compressed = QEMUD_SAVE_FORMAT_RAW; ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, - (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0); + (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0, + NULL); vm = NULL; cleanup: @@ -3696,7 +3711,8 @@ qemuDomainSaveImageOpen(struct qemud_driver *driver, const char *path, virDomainDefPtr *ret_def, struct qemud_save_header *ret_header, - bool bypass_cache, virFileDirectFdPtr *directFd) + bool bypass_cache, virFileDirectFdPtr *directFd, + const char *xmlin) { int fd; struct qemud_save_header header; @@ -3780,6 +3796,20 @@ qemuDomainSaveImageOpen(struct qemud_driver *driver, QEMU_EXPECTED_VIRT_TYPES, VIR_DOMAIN_XML_INACTIVE))) goto error; + if (xmlin) { + virDomainDefPtr def2 = NULL; + + if (!(def2 = virDomainDefParseString(driver->caps, xmlin, + QEMU_EXPECTED_VIRT_TYPES, + VIR_DOMAIN_XML_INACTIVE))) + goto error; + if (!virDomainDefCheckABIStability(def, def2)) { + virDomainDefFree(def2); + goto error; + } + virDomainDefFree(def); + def = def2; + } VIR_FREE(xml); @@ -3914,17 +3944,12 @@ qemuDomainRestoreFlags(virConnectPtr conn, virFileDirectFdPtr directFd = NULL; virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE, -1); - if (dxml) { - qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); - return -1; - } qemuDriverLock(driver); fd = qemuDomainSaveImageOpen(driver, path, &def, &header, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0, - &directFd); + &directFd, dxml); if (fd < 0) goto cleanup; @@ -3984,7 +4009,7 @@ qemuDomainObjRestore(virConnectPtr conn, virFileDirectFdPtr directFd = NULL; fd = qemuDomainSaveImageOpen(driver, path, &def, &header, - bypass_cache, &directFd); + bypass_cache, &directFd, NULL); if (fd < 0) goto cleanup; -- 1.7.4.4

2 8

[libvirt] How to connect to the running VM
by bala suru 29 Jul '11

29 Jul '11

Hi, I have deployed some VM on to the KVM-qemu and installed libvirtd .. I could see the VM running by command virsh list . but how to login to the VMs other than SSH ..? i tried virsh vncdisplay , but no output .. regards bala

4 3

Re: [libvirt] How to connect to the running VM
by Zdenek Styblik 29 Jul '11

29 Jul '11

On 07/29/11 17:32, bala suru wrote: > Hi, > Thanks for the information i'll try this .. > > How to create a kvm image from machine which already has the kvm setup > and virt-manager ..? > > So far I was using the images created for KVM for the VM .. now I want to > create a kvm image my self from iso image ... > > > regards > Bala You're welcome. As for images, use % virsh; and 'vol-create-as', or % qemu-img; command. % virsh -c qemu:///system ; and ' virsh # help vol-create-as ;' for details about this command. There is also % qemu-img;, however do not do things behind libvirt's back or it will backfire on you. I highly recommend to use either some cli tool/scripts eg. for VM definition or virt-manager or some other GUI tool. It makes your life easier and things go faster(and sometimes smoother). http://www.linux-kvm.org/page/Management_Tools Regards, Z. > On Fri, Jul 29, 2011 at 7:06 AM, Zdenek Styblik <stybla(a)turnovfree.net>wrote: > >> On 07/29/11 13:36, bala suru wrote: >>> Hi, >>> I have deployed some VM on to the KVM-qemu and installed libvirtd .. >>> >>> I could see the VM running by command virsh list . >>> >>> but how to login to the VMs other than SSH ..? i tried virsh vncdisplay , >>> but no output .. >>> >>> regards >>> bala >>> >>> >>> >>> >>> -- >>> libvir-list mailing list >>> libvir-list(a)redhat.com >>> https://www.redhat.com/mailman/listinfo/libvir-list >> >> Hello, >> >> if VM is running at localhost eg. your workstation, I do: >> >> % netstat -nlp; >> >> look for '127.0.0.1:590x' as libvirt assigns VNC ports automatically and >> in incremental order. (Note: this, however, is not a rule. And you can >> assign whatever port you want by hand.) >> >> ~~~ SNIP ~~~ >> tcp 0 0 localhost:5901 *:* >> LISTEN - >> ~~~ SNIP ~~~ >> >> Then I just use VNC client like % vncviewer localhost:5901; to connect >> to VM. >> >> Have you tried to hit a key or move the mouse? Console/screen might be >> in suspend mode in order to "save" power. >> >> Also, there might be few catches which depend on your setup. >> 1] are you sure VM has VNC console assigned? Use % virsh; and 'dumpxml >> <domain>' command to check out. >> >> ~~~ SNIP ~~~ >> <graphics type='vnc' port='5901' autoport='yes'/> >> ~~~ SNIP ~~~ >> >> 2] it might be password protected, TLS might be required etc. etc. >> >> If it's at remote host, I recommend to use SSH to tunnel VNC port. You >> can find how-to at internet. >> You can also use 'virt-manager' which is included as package in many >> distributions. Well, at least in Fedora, Debian and, I believe, Ubuntu. >> >> I hope lines above help you a bit. >> >> Regards, >> Zdenek >> >> -- >> Zdenek Styblik >> email: stybla(a)turnovfree.net >> jabber: stybla(a)jabber.turnovfree.net >> > -- Zdenek Styblik email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

1 0

[libvirt] [PATCH] tests: Don't use bash if we don't have to
by Matthias Bolte 29 Jul '11

29 Jul '11

This tested failed on FreeBSD because it was using bash, that might not be installed. --- tests/int-overflow | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/int-overflow b/tests/int-overflow index baf2eef..36e5536 100755 --- a/tests/int-overflow +++ b/tests/int-overflow @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Ensure that an invalid domain ID isn't interpreted as a valid one. # Before, an ID of 2^32+2 would be treated just like an ID of 2. -- 1.7.4.1

2 2

[libvirt] [PATCH] utils: More useful error message for hook script failure
by Osier Yang 29 Jul '11

29 Jul '11

Commit 3709a386 ported hooks codes to new command execution API, together with the useful error message removed. Though we can't get "errbuf" from the new command execution API anymore, still we can give a more useful error. https://bugzilla.redhat.com/show_bug.cgi?id=726398 --- src/util/hooks.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/util/hooks.c b/src/util/hooks.c index 64adfcb..00f3a01 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -193,6 +193,7 @@ int virHookCall(int driver, const char *id, int op, int sub_op, const char *extra, const char *input) { int ret; + int exitstatus; char *path; virCommandPtr cmd; const char *drvstr; @@ -257,7 +258,13 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra, if (input) virCommandSetInputBuffer(cmd, input); - ret = virCommandRun(cmd, NULL); + ret = virCommandRun(cmd, &exitstatus); + if (exitstatus != 0) { + virHookReportError(VIR_ERR_HOOK_SCRIPT_FAILED, + _("Hook script %s %s failed with error code %d"), + path, drvstr, exitstatus); + ret = -1; + } virCommandFree(cmd); -- 1.7.6

3 3

[libvirt] [PATCHv2 1/2] maint: add missing copyright notices
by Eric Blake 29 Jul '11

29 Jul '11

I went with the shorter license notice used by src/libvirt.c, rather than spelling out the full LGPLv2+ clause into each of these files. * configure.ac: Declare copyright. * all Makefile.am: Likewise. --- Noticed while reviewing Matthias' patch. Almost trivial enough to push in isolation, but I'll wait for the review. Makefile.am | 3 +++ configure.ac | 3 +++ daemon/Makefile.am | 3 +++ docs/Makefile.am | 4 ++++ docs/schemas/Makefile.am | 3 ++- examples/apparmor/Makefile.am | 3 +++ examples/domain-events/events-c/Makefile.am | 3 +++ examples/dominfo/Makefile.am | 2 ++ examples/domsuspend/Makefile.am | 2 ++ examples/hellolibvirt/Makefile.am | 3 +++ examples/openauth/Makefile.am | 3 +++ examples/python/Makefile.am | 3 +++ examples/systemtap/Makefile.am | 2 ++ examples/xml/nwfilter/Makefile.am | 2 ++ include/Makefile.am | 4 ++++ include/libvirt/Makefile.am | 3 +++ python/Makefile.am | 3 +++ python/tests/Makefile.am | 3 +++ src/Makefile.am | 3 +++ tests/Makefile.am | 3 +++ tools/Makefile.am | 2 ++ 21 files changed, 59 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 49e42bf..75cff8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + LCOV = lcov GENHTML = genhtml diff --git a/configure.ac b/configure.ac index ac34efc..36037e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,8 @@ dnl Process this file with autoconf to produce a configure script. +dnl Copyright (C) 2005-2011 Red Hat, Inc. +dnl See COPYING.LIB for the License of this software + AC_INIT([libvirt], [0.9.3], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 63c731e..65ac8e9 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + CLEANFILES = DAEMON_GENERATED = \ diff --git a/docs/Makefile.am b/docs/Makefile.am index de649fe..50a199f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,8 @@ ## Process this file with automake to produce Makefile.in + +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SUBDIRS= schemas PERL = perl diff --git a/docs/schemas/Makefile.am b/docs/schemas/Makefile.am index 75a0e73..596c207 100644 --- a/docs/schemas/Makefile.am +++ b/docs/schemas/Makefile.am @@ -1,4 +1,5 @@ - +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software schemadir = $(pkgdatadir)/schemas schema_DATA = \ diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index b72bbe1..0bc66ac 100644 --- a/examples/apparmor/Makefile.am +++ b/examples/apparmor/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + EXTRA_DIST= \ TEMPLATE \ libvirt-qemu \ diff --git a/examples/domain-events/events-c/Makefile.am b/examples/domain-events/events-c/Makefile.am index 176892b..2bcbca0 100644 --- a/examples/domain-events/events-c/Makefile.am +++ b/examples/domain-events/events-c/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib noinst_PROGRAMS = event-test diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am index 678de68..07982b0 100644 --- a/examples/dominfo/Makefile.am +++ b/examples/dominfo/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am index 2c277a4..fc5e931 100644 --- a/examples/domsuspend/Makefile.am +++ b/examples/domsuspend/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am index 8d108a7..a55fe19 100644 --- a/examples/hellolibvirt/Makefile.am +++ b/examples/hellolibvirt/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = hellolibvirt hellolibvirt_CFLAGS = $(WARN_CFLAGS) diff --git a/examples/openauth/Makefile.am b/examples/openauth/Makefile.am index 279a032..844b572 100644 --- a/examples/openauth/Makefile.am +++ b/examples/openauth/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = openauth openauth_CFLAGS = $(WARN_CFLAGS) diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am index dcd2c24..d782a28 100644 --- a/examples/python/Makefile.am +++ b/examples/python/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + EXTRA_DIST= \ README \ dominfo.py domrestore.py domsave.py domstart.py esxlist.py diff --git a/examples/systemtap/Makefile.am b/examples/systemtap/Makefile.am index 084081e..6eb0546 100644 --- a/examples/systemtap/Makefile.am +++ b/examples/systemtap/Makefile.am @@ -1,2 +1,4 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software EXTRA_DIST = client.stp diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 439e7b8..23fd753 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software FILTERS = \ allow-arp.xml \ diff --git a/include/Makefile.am b/include/Makefile.am index d075971..426762c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,6 @@ ## Process this file with automake to produce Makefile.in + +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SUBDIRS=libvirt diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am index b2c2b76..8f36ae8 100644 --- a/include/libvirt/Makefile.am +++ b/include/libvirt/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + virincdir = $(includedir)/libvirt virinc_HEADERS = libvirt.h \ diff --git a/python/Makefile.am b/python/Makefile.am index 51f005d..0e14d23 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,5 +1,8 @@ # Makefile for libvirt python library +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SUBDIRS= . tests INCLUDES = \ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 28e24ba..2a5bc62 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + EXAMPLE_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)/examples PYTESTS= \ diff --git a/src/Makefile.am b/src/Makefile.am index 46b92a8..00307fa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them diff --git a/tests/Makefile.am b/tests/Makefile.am index 872aa22..1560ac1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SHELL = $(PREFERABLY_POSIX_SHELL) INCLUDES = \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 62c275e..66d4ed2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" -- 1.7.4.4

3 5

[libvirt] ANNOUNCE: ruby-libvirt 0.4.0
by Chris Lalancette 29 Jul '11

29 Jul '11

All, I'm pleased to announce the release of ruby-libvirt 0.4.0. ruby-libvirt is a ruby wrapper around the libvirt API. Version 0.4.0 brings new APIs, more documentation, and bugfixes: * Updated Domain class, implementing dom.memory_parameters=, dom.memory_parameters, dom.updated?, dom.migrate2, dom.migrate_to_uri2, dom.migrate_set_max_speed, dom.qemu_monitor_command, dom.blkio_parameters, dom.blkio_parameters=, dom.state, dom.open_console, dom.screenshot, and dom.inject_nmi * Implementation of the Stream class, which covers the libvirt virStream APIs * Add the ability to build against non-system libvirt libraries * Updated Error object, which now includes the libvirt code, component and level of the error, as well as all of the error constants from libvirt.h * Updated Connect class, implementing conn.sys_info, conn.stream, conn.interface_change_begin, conn.interface_change_commit, and conn.interface_change_rollback * Updated StorageVol class, implementing vol.download and vol.upload * Various bugfixes Version 0.4.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.4.0.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.4.0.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalance(a)redhat.com) and/or the libvirt mailing list. -- Chris Lalancette

1 0

[libvirt] [PATCH] freebsd: Avoid /bin/true in commandtest
by Matthias Bolte 29 Jul '11

29 Jul '11

Rely on PATH and use just true, because on FreeBSD it's /usr/bin/true. --- tests/commanddata/test16.log | 2 +- tests/commandtest.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/commanddata/test16.log b/tests/commanddata/test16.log index 2433a4d..7088165 100644 --- a/tests/commanddata/test16.log +++ b/tests/commanddata/test16.log @@ -1 +1 @@ -A=B /bin/true C +A=B true C diff --git a/tests/commandtest.c b/tests/commandtest.c index 2e800ae..9ba53b8 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -566,9 +566,9 @@ cleanup: */ static int test16(const void *unused ATTRIBUTE_UNUSED) { - virCommandPtr cmd = virCommandNew("/bin/true"); + virCommandPtr cmd = virCommandNew("true"); char *outactual = NULL; - const char *outexpect = "A=B /bin/true C"; + const char *outexpect = "A=B true C"; int ret = -1; int fd = -1; @@ -610,7 +610,7 @@ cleanup: */ static int test17(const void *unused ATTRIBUTE_UNUSED) { - virCommandPtr cmd = virCommandNew("/bin/true"); + virCommandPtr cmd = virCommandNew("true"); int ret = -1; char *outbuf; char *errbuf; -- 1.7.4.1

2 2

[libvirt] [PATCH] tests: Unify style of test skipping code
by Matthias Bolte 29 Jul '11

29 Jul '11

Prefer 'return EXIT_AM_SKIP' over 'exit(EXIT_AM_SKIP)'. Prefer 'int main(void)' over 'int main(int argc, char **argv)'. Fix mymain signature in commandtest and nodeinfotest. --- tests/commandtest.c | 10 +++++----- tests/nodeinfotest.c | 10 +++++----- tests/qemuargv2xmltest.c | 6 +++++- tests/qemuxml2xmltest.c | 6 +++++- tests/virnettlscontexttest.c | 6 ++++-- tests/virshtest.c | 26 +++++++++++++++++--------- 6 files changed, 41 insertions(+), 23 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index ef2850d..2e800ae 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -38,10 +38,10 @@ #ifdef WIN32 -static int -mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +int +main(void) { - exit (EXIT_AM_SKIP); + return EXIT_AM_SKIP; } #else @@ -814,6 +814,6 @@ mymain(void) return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -#endif /* !WIN32 */ - VIRT_TEST_MAIN(mymain) + +#endif /* !WIN32 */ diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 5abee92..448e072 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -15,10 +15,10 @@ defined(__amd64__) || \ defined(__i386__))) -static int -mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +int +main(void) { - exit (EXIT_AM_SKIP); + return EXIT_AM_SKIP; } #else @@ -130,6 +130,6 @@ mymain(void) return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -#endif /* __linux__ */ - VIRT_TEST_MAIN(mymain) + +#endif /* __linux__ */ diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index bade95d..c2b6cf2 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -239,6 +239,10 @@ VIRT_TEST_MAIN(mymain) #else -int main (void) { return (EXIT_AM_SKIP); } +int +main(void) +{ + return EXIT_AM_SKIP; +} #endif /* WITH_QEMU */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f1900c5..461fd0d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -204,6 +204,10 @@ VIRT_TEST_MAIN(mymain) #else -int main (void) { exit (EXIT_AM_SKIP); } +int +main(void) +{ + return EXIT_AM_SKIP; +} #endif /* WITH_QEMU */ diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 12ecf1e..520b006 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -1249,9 +1249,11 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else + int -main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +main(void) { - exit (EXIT_AM_SKIP); + return EXIT_AM_SKIP; } + #endif diff --git a/tests/virshtest.c b/tests/virshtest.c index e22e582..de5138c 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -9,7 +9,17 @@ #include "util.h" #include "testutils.h" -#define DOM_UUID "ef861801-45b9-11cb-88e3-afbfe5370493" +#ifdef WIN32 + +int +main(void) +{ + return EXIT_AM_SKIP; +} + +#else + +# define DOM_UUID "ef861801-45b9-11cb-88e3-afbfe5370493" static const char *dominfo_fc4 = "\ Id: 2\n\ @@ -71,13 +81,13 @@ cleanup: return result; } -#define VIRSH_DEFAULT "../tools/virsh", \ +# define VIRSH_DEFAULT "../tools/virsh", \ "--connect", \ "test:///default" static char *custom_uri; -#define VIRSH_CUSTOM "../tools/virsh", \ +# define VIRSH_CUSTOM "../tools/virsh", \ "--connect", \ custom_uri @@ -224,10 +234,6 @@ mymain(void) { int ret = 0; -#ifdef WIN32 - exit (EXIT_AM_SKIP); -#endif - if (virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", abs_srcdir) < 0) return EXIT_FAILURE; @@ -298,7 +304,7 @@ mymain(void) /* It's a bit awkward listing result before argument, but that's a * limitation of C99 vararg macros. */ -#define DO_TEST(i, result, ...) \ +# define DO_TEST(i, result, ...) \ do { \ const char *myargv[] = { VIRSH_DEFAULT, __VA_ARGS__, NULL }; \ const struct testInfo info = { myargv, result }; \ @@ -380,10 +386,12 @@ mymain(void) DO_TEST(30, "--shell a\n", "echo \t '-'\"-\" \t --shell \t a"); -#undef DO_TEST +# undef DO_TEST free(custom_uri); return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } VIRT_TEST_MAIN(mymain) + +#endif /* WIN32 */ -- 1.7.4.1

2 2

[libvirt] [PATCH 0/4] xen callback cleanups
by Eric Blake 28 Jul '11

28 Jul '11

Noticed because of the recent xen break in commit 1edf5cc5 (fixed in 934fdcb3), which broke because it touched too many files, rather than focusing on just xen_driver.c. Renaming all xen callback structs makes it easier to grep for use of the callback structs, which in turn makes it easier to see what still remains in the goal of getting rid of the callback struct. And using C99 initialization syntax makes it less likely that future patches will needlessly try to patch too many files. Eric Blake (4): xen: cleanup callback struct xen: reduce callback special cases xen: make direct call when there is only one subdriver xen: drop unused callbacks src/xen/xen_driver.c | 186 ++++++++++++++++++---------------------------- src/xen/xen_driver.h | 63 ++++++---------- src/xen/xen_hypervisor.c | 52 ++++---------- src/xen/xen_inotify.c | 39 +---------- src/xen/xend_internal.c | 68 +++++++---------- src/xen/xend_internal.h | 6 ++ src/xen/xm_internal.c | 51 +++---------- src/xen/xs_internal.c | 45 ++---------- 8 files changed, 167 insertions(+), 343 deletions(-) -- 1.7.4.4

2 11

[libvirt] libvirt-0.9.3 and qemu-0.14.1
by Zdenek Styblik 28 Jul '11

28 Jul '11

Hello, I'm not sure if this has been reported or fixed, but ... ~~~ SNIP ~~~ 21:02:59.981: 13171: info : libvirt version: 0.9.3 21:02:59.981: 13171: error : virCommandWait:1957 : internal error Child process (LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-kvm -help) status unexpected: exit status 1 21:02:59.986: 13171: error : virCommandWait:1957 : internal error Child process (LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-kvm -help) status unexpected: exit status 1 21:02:59.988: 13171: error : virDomainDefParseXML:6069 : unknown OS type hvm ~~~ SNIP ~~~ qemu-0.14.1 and libvirt-0.9.3 What am I missing here? Thanks, Z. -- Zdenek Styblik email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

1 1

[libvirt] [PATCH] freebsd: Fix build problem due to picking up the wrong libvirt.h
by Matthias Bolte 28 Jul '11

28 Jul '11

AM_GNU_GETTEXT calls AM_ICONV_LINK. AM_ICONV_LINK saves and alters CPPFLAGS, but doesn't restore it when it finds libiconv. This results in /usr/local/include ending up in the gcc command line before the include path for the local include directory. This makes gcc pick a previous installed libvirt.h instead of the correct one from the source tree. Workaround this problem by saving and restoring CPPFLAGS around the AM_GNU_GETTEXT call. --- configure.ac | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index b2ba930..8f46dbd 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,8 +2011,16 @@ dnl Enable building libvirtd? AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"]) dnl Check for gettext - don't go any newer than what RHEL 5 supports +dnl +dnl save and restore CPPFLAGS around gettext check as the internal iconv +dnl check might leave -I/usr/local/include in CPPFLAGS on FreeBSD resulting +dnl in the build picking up previously installed libvirt/libvirt.h instead +dnl of the correct one from the soucre tree + +save_CPPFLAGS="$CPPFLAGS" AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) +CPPFLAGS="$save_CPPFLAGS" ALL_LINGUAS=`cd "$srcdir/po" > /dev/null && ls *.po | sed 's+\.po$++'` -- 1.7.0.4

2 6

[libvirt] [PATCH v4] virsh: avoid missing zero value judgement in cmdBlkiotune
by ajia＠redhat.com 28 Jul '11

28 Jul '11

* tools/virsh.c: fix missing zero value judgement in cmdBlkiotune and correct vshError information. when weight is equal to 0, the cmdBlkiotune will not raise any error information when judge weight value first time, and execute else branch to judge weight value again, strncpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT, sizeof(temp->field)) will be not executed for ever. However, if and only if param->field is equal to VIR_DOMAIN_BLKIO_WEIGHT, underlying qemuDomainSetBlkioParameters function will check whether weight value is in range [100, 1000]. * how to reproduce? % virsh blkiotune ${guestname} --weight 0 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8bd22dc..feb45de 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4004,6 +4004,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) virDomainPtr dom; int weight = 0; int nparams = 0; + int rv = 0; unsigned int i = 0; virTypedParameterPtr params = NULL, temp = NULL; bool ret = false; @@ -4031,15 +4032,15 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(cmd, "weight", &weight) < 0) { + if ((rv = vshCommandOptInt(cmd, "weight", &weight)) < 0) { vshError(ctl, "%s", - _("Unable to parse integer parameter")); + _("Unable to parse non-integer parameter")); goto cleanup; } - if (weight) { + if (rv > 0) { nparams++; - if (weight < 0) { + if (weight <= 0) { vshError(ctl, _("Invalid value of %d for I/O weight"), weight); goto cleanup; } -- 1.7.1

4 4

[libvirt] [PATCH] qemu: fix nested job with driver lock held
by Eric Blake 28 Jul '11

28 Jul '11

qemuMigrationUpdateJobStatus (called in a loop by migration and save tasks) uses qemuDomainObjEnterMonitorWithDriver; however, that function ended up starting a nested job without releasing the driver. Since no one else is making nested calls, we can inline the internal functions to properly track driver_locked. * src/qemu/qemu_domain.h (qemuDomainObjBeginNestedJob) (qemuDomainObjBeginNestedJobWithDriver) (qemuDomainObjEndNestedJob): Drop unused prototypes. * src/qemu/qemu_domain.c (qemuDomainObjEnterMonitorInternal): Reflect driver lock to nested job. (qemuDomainObjBeginNestedJob) (qemuDomainObjBeginNestedJobWithDriver) (qemuDomainObjEndNestedJob): Drop unused functions. --- This does not solve the crash in 'virsh managedsave', but hopefully will make analysis easier in finding where we are freeing the monitor too early when probing to see if outgoing migration is completed. src/qemu/qemu_domain.c | 59 +++++++++++------------------------------------ src/qemu/qemu_domain.h | 9 ------- 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe88ce3..2eaaf3a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -832,31 +832,6 @@ int qemuDomainObjBeginAsyncJobWithDriver(struct qemud_driver *driver, } /* - * Use this to protect monitor sections within active async job. - * - * The caller must call qemuDomainObjBeginAsyncJob{,WithDriver} before it can - * use this method. Never use this method if you only own non-async job, use - * qemuDomainObjBeginJob{,WithDriver} instead. - */ -int -qemuDomainObjBeginNestedJob(struct qemud_driver *driver, - virDomainObjPtr obj) -{ - return qemuDomainObjBeginJobInternal(driver, false, obj, - QEMU_JOB_ASYNC_NESTED, - QEMU_ASYNC_JOB_NONE); -} - -int -qemuDomainObjBeginNestedJobWithDriver(struct qemud_driver *driver, - virDomainObjPtr obj) -{ - return qemuDomainObjBeginJobInternal(driver, true, obj, - QEMU_JOB_ASYNC_NESTED, - QEMU_ASYNC_JOB_NONE); -} - -/* * obj must be locked before calling, qemud_driver does not matter * * To be called after completing the work associated with the @@ -888,21 +863,6 @@ qemuDomainObjEndAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) return virDomainObjUnref(obj); } -void -qemuDomainObjEndNestedJob(struct qemud_driver *driver, virDomainObjPtr obj) -{ - qemuDomainObjPrivatePtr priv = obj->privateData; - - qemuDomainObjResetJob(priv); - qemuDomainObjSaveJob(driver, obj); - virCondSignal(&priv->job.cond); - - /* safe to ignore since the surrounding async job increased the reference - * counter as well */ - ignore_value(virDomainObjUnref(obj)); -} - - static int ATTRIBUTE_NONNULL(1) qemuDomainObjEnterMonitorInternal(struct qemud_driver *driver, bool driver_locked, @@ -911,7 +871,9 @@ qemuDomainObjEnterMonitorInternal(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = obj->privateData; if (priv->job.active == QEMU_JOB_NONE && priv->job.asyncJob) { - if (qemuDomainObjBeginNestedJob(driver, obj) < 0) + if (qemuDomainObjBeginJobInternal(driver, driver_locked, obj, + QEMU_JOB_ASYNC_NESTED, + QEMU_ASYNC_JOB_NONE) < 0) return -1; if (!virDomainObjIsActive(obj)) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -952,8 +914,15 @@ qemuDomainObjExitMonitorInternal(struct qemud_driver *driver, priv->mon = NULL; } - if (priv->job.active == QEMU_JOB_ASYNC_NESTED) - qemuDomainObjEndNestedJob(driver, obj); + if (priv->job.active == QEMU_JOB_ASYNC_NESTED) { + qemuDomainObjResetJob(priv); + qemuDomainObjSaveJob(driver, obj); + virCondSignal(&priv->job.cond); + + /* safe to ignore since the surrounding async job increased + * the reference counter as well */ + ignore_value(virDomainObjUnref(obj)); + } } /* @@ -962,7 +931,7 @@ qemuDomainObjExitMonitorInternal(struct qemud_driver *driver, * To be called immediately before any QEMU monitor API call * Must have already either called qemuDomainObjBeginJob() and checked * that the VM is still active or called qemuDomainObjBeginAsyncJob, in which - * case this will call qemuDomainObjBeginNestedJob. + * case this will start a nested job. * * To be followed with qemuDomainObjExitMonitor() once complete */ @@ -988,7 +957,7 @@ void qemuDomainObjExitMonitor(struct qemud_driver *driver, * To be called immediately before any QEMU monitor API call * Must have already either called qemuDomainObjBeginJobWithDriver() and * checked that the VM is still active or called qemuDomainObjBeginAsyncJob, - * in which case this will call qemuDomainObjBeginNestedJobWithDriver. + * in which case this will start a nested job. * * To be followed with qemuDomainObjExitMonitorWithDriver() once complete */ diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 679259f..8bff8b0 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -143,9 +143,6 @@ int qemuDomainObjBeginAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj, enum qemuDomainAsyncJob asyncJob) ATTRIBUTE_RETURN_CHECK; -int qemuDomainObjBeginNestedJob(struct qemud_driver *driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, virDomainObjPtr obj, enum qemuDomainJob job) @@ -154,9 +151,6 @@ int qemuDomainObjBeginAsyncJobWithDriver(struct qemud_driver *driver, virDomainObjPtr obj, enum qemuDomainAsyncJob asyncJob) ATTRIBUTE_RETURN_CHECK; -int qemuDomainObjBeginNestedJobWithDriver(struct qemud_driver *driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; int qemuDomainObjEndJob(struct qemud_driver *driver, virDomainObjPtr obj) @@ -164,9 +158,6 @@ int qemuDomainObjEndJob(struct qemud_driver *driver, int qemuDomainObjEndAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; -void qemuDomainObjEndNestedJob(struct qemud_driver *driver, - virDomainObjPtr obj); - void qemuDomainObjSetJobPhase(struct qemud_driver *driver, virDomainObjPtr obj, int phase); -- 1.7.4.4

2 2

[libvirt] [PATCH] build: avoid type-punning compiler warning
by Eric Blake 28 Jul '11

28 Jul '11

On RHEL 5, with gcc 4.1.2: rpc/virnetsaslcontext.c: In function 'virNetSASLSessionUpdateBufSize': rpc/virnetsaslcontext.c:396: warning: dereferncing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] * src/rpc/virnetsaslcontext.c (virNetSASLSessionUpdateBufSize): Use a union to work around gcc warning. --- src/rpc/virnetsaslcontext.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index 71796b9..a0752dd 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -390,10 +390,13 @@ cleanup: static int virNetSASLSessionUpdateBufSize(virNetSASLSessionPtr sasl) { - unsigned *maxbufsize; + union { + unsigned *maxbufsize; + const void *ptr; + } u; int err; - err = sasl_getprop(sasl->conn, SASL_MAXOUTBUF, (const void **)&maxbufsize); + err = sasl_getprop(sasl->conn, SASL_MAXOUTBUF, &u.ptr); if (err != SASL_OK) { virNetError(VIR_ERR_INTERNAL_ERROR, _("cannot get security props %d (%s)"), @@ -402,8 +405,8 @@ static int virNetSASLSessionUpdateBufSize(virNetSASLSessionPtr sasl) } VIR_DEBUG("Negotiated bufsize is %u vs requested size %zu", - *maxbufsize, sasl->maxbufsize); - sasl->maxbufsize = *maxbufsize; + *u.maxbufsize, sasl->maxbufsize); + sasl->maxbufsize = *u.maxbufsize; return 0; } -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: Fix memory leak on metadata fetching
by Michal Privoznik 28 Jul '11

28 Jul '11

As written in virStorageFileGetMetadataFromFD decription, caller must free metadata after use. Qemu driver miss this and therefore leak metadata which can grow to huge mem leak if somebody query for blockInfo a lot. --- src/qemu/qemu_driver.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f91910..d45c7c5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6949,7 +6949,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, int ret = -1; int fd = -1; off_t end; - virStorageFileMetadata meta; + virStorageFileMetadata *meta = NULL; virDomainDiskDefPtr disk = NULL; struct stat sb; int i; @@ -7017,9 +7017,14 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, } } + if (VIR_ALLOC(meta) < 0) { + virReportOOMError(); + goto cleanup; + } + if (virStorageFileGetMetadataFromFD(path, fd, format, - &meta) < 0) + meta) < 0) goto cleanup; /* Get info for normal formats */ @@ -7056,8 +7061,8 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, /* If the file we probed has a capacity set, then override * what we calculated from file/block extents */ - if (meta.capacity) - info->capacity = meta.capacity; + if (meta->capacity) + info->capacity = meta->capacity; /* Set default value .. */ info->allocation = info->physical; @@ -7091,6 +7096,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, } cleanup: + virStorageFileFreeMetadata(meta); VIR_FORCE_CLOSE(fd); if (vm) virDomainObjUnlock(vm); -- 1.7.5.rc3

2 2

Re: [libvirt] PCI devices passthough to LXC containers using libvirt
by Devendra K. Modium 28 Jul '11

28 Jul '11

Hi Thanks for the reply. I think the links that you provided show how to deal with pci devices in case the hypervisor is kvm. Please correct me if I am wrong. But I am using LXC containers.I have skimmed through the libvirt lxc driver code and found no functionality of allowing specified devices into a container exists other than currently where only hard coded devices are allowed which can be seen in the file lxc_controller.c struct cgroup_device_policy devices[] = { {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_NULL}, {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_ZERO}, {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_FULL}, {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM}, {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM}, {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY}, {'c', LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX}, {0, 0, 0}}; Please confirm this or let me know if there is any other interface libvirt_lxc provides to allow specific pci/other devices into container. Thanks in advance Regards Devendra ----- Original Message ----- From: "Alex Jia" <ajia(a)redhat.com> To: "Devendra K. Modium" <dmodium(a)isi.edu> Sent: Thursday, July 28, 2011 3:22:36 AM Subject: Re: [libvirt] PCI devices passthough to LXC containers using libvirt On 07/28/2011 05:13 AM, Devendra K. Modium wrote: > Hi All > > Please let me know if anyone have given access to > PCI devices for a LXC container. > > I have tried getting the xml from > "virsh nodedev-dumpxml pci_device" and > added to the libvirt xml file as shown below > > <device> > <name>pci_0000_03_00_0</name> > <parent>pci_0000_00_03_0</parent> > <driver> > <name>nvidia</name> > </driver> > <capability type='pci'> > <domain>0</domain> > <bus>3</bus> > <slot>0</slot> > <function>0</function> > <product id='0x06fd' /> > <vendor id='0x10de'>nVidia Corporation</vendor> > </capability> > </device> You shouldn't directly add the above xml to guest xml configuration, here is a usage, it should be helpful for you: http://libvirt.org/formatdomain.html#elementsUSB http://fedoraproject.org/wiki/Category:Virtualization_KVM_PCI_Device_Assign… Good Luck! Alex > > But it didn't work. I see the logs and it says > couldn't get physical and virtual functions of these devices with error > > get_physical_function_linux:323 : Attempting to get SR IOV physical function for device with sysfs path '/sys/devices/pci0000:00/0000:00:00.0' > 16:48:34.033: 13802: debug : get_sriov_function:270 : Attempting to resolve device path from device link '/sys/devices/pci0000:00/0000:00:00.0/physfn' > 16:48:34.033: 13802: debug : get_sriov_function:274 : SR IOV function link '/sys/devices/pci0000:00/0000:00:00.0/physfn' does not exist > 16:48:34.033: 13802: debug : get_virtual_functions_linux:348 : Attempting to get SR IOV virtual functions for devicewith sysfs path '/sys/devices/pci0000:00/0000:00:00.0' > > > If anyone got some guidelines how to debug, please let me know. > > > Thanks in advance > > Regards > Devendra > > > > > > > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list

2 1

[libvirt] [PATCH v3] virsh: avoid missing zero value judgement in cmdBlkiotune
by ajia＠redhat.com 28 Jul '11

28 Jul '11

* tools/virsh.c: avoid missing zero value judgement in cmdBlkiotune, when weight is equal to 0, the cmdBlkiotune will not raise any error information when judge weight value first time, and execute else branch to judge weight value again, strncpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT, sizeof(temp->field)) will be not executed for ever. However, if and only if param->field is equal to VIR_DOMAIN_BLKIO_WEIGHT, underlying qemuDomainSetBlkioParameters function will check whether weight value is in range [100, 1000]. * how to reproduce? % virsh blkiotune ${guestname} --weight 0 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8bd22dc..f24050d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4037,12 +4037,12 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) goto cleanup; } - if (weight) { - nparams++; - if (weight < 0) { + if (vshCommandOptInt(cmd, "weight", &weight) > 0) { + if (weight <= 0) { vshError(ctl, _("Invalid value of %d for I/O weight"), weight); goto cleanup; } + nparams++; } if (nparams == 0) { -- 1.7.1

4 3

[libvirt] [PATCH v2] virsh: avoid missing zero value judgement in cmdBlkiotune
by ajia＠redhat.com 28 Jul '11

28 Jul '11

* tools/virsh.c: avoid missing zero value judgement in cmdBlkiotune, when weight is equal to 0, the cmdBlkiotune will not raise any error information when judge weight value first time, and execute else branch to judge weight value again, strncpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT, sizeof(temp->field)) will be not executed for ever. However, if and only if param->field is equal to VIR_DOMAIN_BLKIO_WEIGHT, underlying qemuDomainSetBlkioParameters function will check whether weight value is in range [100, 1000]. * how to reproduce? % virsh blkiotune ${guestname} --weight 0 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8bd22dc..512f2c6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4037,14 +4037,13 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) goto cleanup; } - if (weight) { - nparams++; - if (weight < 0) { - vshError(ctl, _("Invalid value of %d for I/O weight"), weight); - goto cleanup; - } + if (weight <= 0) { + vshError(ctl, _("Invalid value of %d for I/O weight"), weight); + goto cleanup; } + nparams++; + if (nparams == 0) { /* get the number of blkio parameters */ if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) != 0) { -- 1.7.1

3 5

[libvirt] RFC: API additions for enhanced snapshot support
by Eric Blake 28 Jul '11

28 Jul '11

Right now, libvirt has a snapshot API via virDomainSnapshotCreateXML, but for qemu domains, it only works if all the guest disk images are qcow2, and qemu rather than libvirt does all the work. However, it has a couple of drawbacks: it is inherently tied to domains (there is no way to manage snapshots of storage volumes not tied to a domain, even though libvirt does that for qcow2 images associated with offline qemu domains by using the qemu-img application). And it necessarily operates on all of the images associated with a domain in parallel - if any disk image is not qcow2, the snapshot fails, and there is no way to select a subset of disks to save. However, it works on both active (disk and memory state) and inactive domains (just disk state). Upstream qemu is developing a 'live snapshot' feature, which allows the creation of a snapshot without the current downtime of several seconds required by the current 'savevm' monitor command, as well as means for controlling applications (libvirt) to request that qemu pause I/O to a particular disk, then externally perform a snapshot, then tell qemu to resume I/O (perhaps on a different file name or fd from the host, but with no change to the contents seen by the guest). Eventually, these changes will make it possible for libvirt to create fast snapshots of LVM partitions or btrfs files for guest disk images, as well as to select which disks are saved in a snapshot (that is, save a crash-consistent state of a subset of disks, without the corresponding RAM state, rather than making a full system restore point); the latter would work best with guest cooperation to quiesce disks before qemu pauses I/O to that disk, but that is an orthogonal enhancement. However, my first goal with API enhancements is to merely prove that libvirt can manage a live snapshot by using qemu-img on a qcow2 image rather than the current 'savevm' approach of qemu doing all the work. Additionally, libvirt provides the virDomainSave command, which saves just the state of the domain's memory, and stops the guest. A crude libvirt-only snapshot could thus already be done by using virDomainSave, then externally doing a snapshot of all disk images associated with the domain by using virStorageVol APIs, except that such APIs don't yet exist. Additionally, virDomainSave has no flags argument, so there is no way to request that the guest be resumed after the snapshot completes. Right now, I'm proposing the addition of virDomainSaveFlags, along with a series of virStorageVolSnapshot* APIs that mirror the virDomainSnapshot* APIs. This would mean adding: /* Opaque type to manage a snapshot of a single storage volume. */ typedef virStorageVolSnapshotPtr; /* Create a snapshot of a storage volume. XML is optional, if non-NULL, it would be a new top-level element <volsnapshot> which is similar to the top-level <domainsnapshot> for virDomainSnapshotCreateXML, to specify name and description. Flags is 0 for now. */ virStorageVolSnapshotPtr virDomainSnapshotCreateXML(virStorageVolPtr vol, const char *xml, unsigned int flags); [For qcow2, this would be implemented with 'qemu-img snapshot -c', similar to what virDomainSnapshotXML already does on inactive domains. Later, we can add LVM and btrfs support, or even allow full file copies of any file type. Also in the future, we could enhance XML to take a new element that describes a relationship between the name of the original and of the snapshot, in the case where a new filename has to be created to complete the snapshot process.] /* Probe if vol has snapshots. 1 if true, 0 if false, -1 on error. Flags is 0 for now. */ int virStorageVolHasCurrentSnapshot(virStorageVolPtr vol, unsigned int flags); [For qcow2 images, snapshots can be contained within the same file and managed with qemu-img -l, but for other formats, this may mean that libvirt has to start managing externally saved data associated with the storage pool that associates snapshots with filenames. In fact, even for qcow2 it might be useful to support creation of new files backed by the previous snapshot rather than cramming multiple snapshots in one file, so we may have a use for flags to filter out the presence of single-file vs. multiple-file snapshot setups.] /* Revert a volume back to the state of a snapshot, returning 0 on success. Flags is 0 for now. */ int virStorageVolRevertToSnapsot(virStorageVolSnapshotPtr snapshot, unsigned int flags); [For qcow2, this would involve qemu-img snapshot -a. Here, a useful flag might be whether to delete any changes made after the point of the snapshot; virDomainRevertToSnapshot should probably honor the same type of flag.] /* Return the most recent snapshot of a volume, if one exists, or NULL on failure. Flags is 0 for now. */ virStorageVolSnapshotPtr virStorageVolSnapshotCurrent(virStorageVolPtr vol, unsigned int flags); /* Delete the storage associated with a snapshot (although the opaque snapshot object must still be independently freed). If flags is 0, any child snapshots based off of this one are rebased onto the parent; if flags is VIR_STORAGE_VOL_SNAPSHOT_DELETE_CHILDREN , then any child snapshots based off of this one are also deleted. */ int virStorageVolSnapshotDelete(virStorageVolSnapshotPtr snapshot, unsigned int flags); [For qcow2, this would involve qemu-img snapshot -d. For multiple-file snapshots, this would also involve qemu-img commit.] /* Free the object returned by virStorageVolSnapshot{Current,CreateXML,LookupByName}. The storage snapshot associated with this object still exists, if it has not been deleted by virStorageVolSnapshotDelete. */ int virStorageVolSnapshotFree(virStorageVolSnapshotPtr snapshot); /* Return the <volsnapshot> XML details about this snapshot object. Flags is 0 for now. */ int virStorageVolSnapshotGetXMLDesc(virStorageVolSnapshotPtr snapshot, unsigned int flags); /* Return the names of all snapshots associated with this volume, using len from virStorageVolSnapshotLen. Flags is 0 for now. */ int virStorageVolSnapshotListNames(virStorageVolPtr vol, char **names, int nameslen, unsigned int flags); [For qcow2, this involves qemu-img -l. Additionally, if virStorageVolHasCurrentSnapshot learns to filter on in-file vs. multi-file snapshots, then the same flags would apply here.] /* Get the opaque object tied to a snapshot name. Flags is 0 for now. */ virStorageVolSnapshotPtr virStorageVolSnapshotLookupByName(virStorageVolPtr vol, const char *name, unsigned int flags); /* Determine how many snapshots are tied to a volume, or -1 on error. Flags is 0 for now. */ int virStorageVolSnapshotNum(virStorageVolPtr vol, unsigned int flags); [Same flags as for virStorageVolSnapshotListNames.] /* Save a domain into the file 'to' with additional actions. If flags is 0, then xml is ignored, and this is like virDomainSave. If flags includes VIR_DOMAIN_SAVE_DISKS, then all of the associated disk images are also snapshotted, as if by virStorageVolSnapshotCreateXML; the xml argument is optional, but if present, it should be a <domainsnapshot> element with <disk> sub-elements for directions on each disk that needs a non-empty xml argument for proper volume snapshot creation. If flags includes VIR_DOMAIN_SAVE_RESUME, then the guest is resumed after the offline snapshot is complete (note that VIR_DOMAIN_SAVE_RESUME without VIR_DOMAIN_SAVE_DISKS makes little sense, as a saved state file is rendered useless if the disk images are modified before it is resumed). If flags includes VIR_DOMAIN_SAVE_QUIESCE, this requests that a guest agent quiesce disk state before the saved state file is created. */ int virDomainSaveFlags(virDomainPtr domain, const char *to, const char *xml, unsigned int flags); Also, the existing virDomainSnapshotCreateXML can be made more powerful by adding new flags and enhancing the existing XML for <domainsnapshot>. When flags is 0, the current behavior of saving memory state alongside all disks (for running domains, via savevm) or just snapshotting all disks with default settings (for offline domains, via qemu-img) is kept. If flags includes VIR_DOMAIN_SNAPSHOT_LIVE, then the guest must be running, and the new monitor commands for live snapshots are used. If flags includes VIR_DOMAIN_SNAPSHOT_DISKS_ONLY, then only the disks are snapshotted (on a running guest, this generally means they will only be crash-consistent, and will need an fsck before that disk state can be remounted), but it will shave off time by not saving memory. If flags includes VIR_DOMAIN_SNAPSHOT_QUIESCE, then this will additionally request that a guest agent quiesce disk state before the live snapshot is taken (increasing the likelihood of a stable disk, rather than a crash-consistent disk; but it requires cooperation from the guest so it is no more reliable than memballoon changes). As for the XML changes, it makes sense to snapshot just a subset of disks when you only care about crash-consistent state or if you can rely on a guest agent to quiesce the subset of disk(s) you care about, so the existing <domainsnapshot> element needs a new optional subelement to control which disks are snapshotted; additionally, this subelement will be useful for disk image formats that require additional complexity (such as a secondary file name, rather than the inline snapshot feature of qcow2). I'm envisioning something like the following: <domainsnapshot> <name>whatever</name> <disk name='/path/to/image1' snapshot='no'/> <disk name='/path/to/image2'> <volsnapshot>...</volsnapshot> </disk> </domainsnapshot> where there can be up to as many <disk> elements as there are disk <devices> in the domain xml; any domain disk not listed is given default treatment. The name attribute of <disk> is mandatory, in order to match this disk element to one of the domain disks. The snapshot='yes|no' attribute is optional, defaulting to yes, in order to skip a particular disk. The <volsnapshot> subelement is optional, but if present, it would be the same XML as is provided to the virStorageVolSnapshotCreateXML. [And since my first phase of implementation will be focused on inline qcow2 snapshots, I don't yet know what that XML will need to contain for any other type of snapshots, such as mapping out how the snapshot backing file will be named in relation to the possibly new live file.] Any feedback on this approach? Any other APIs that would be useful to add? I'd like to get all the new APIs in place for 0.9.3 with minimal qcow2 functionality, then use the time before 0.9.4 to further enhance the APIs to cover more snapshot cases but without having to add any new APIs. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

9 33