- Devel - libvirt List Archives

[libvirt] Schedule for next release
by Daniel Veillard 20 Aug '13

20 Aug '13

To try to stay on the end of month release schedule, I am suggesting to enter the freeze for 1.1.2 next Tuesday, i.e. the 27th Aug, and then shoot for a release on the morning of Monday 2nd of Sep. So unless I hear disagreements, that's the plan :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] qemuBuildCommandLine: Fall back to mem balloon if there's no hard_limit
by Michal Privoznik 20 Aug '13

20 Aug '13

If there's no hard_limit set and domain uses VFIO we still must lock the guest memory (prerequisite from qemu). Hence, we should compute the amount to be locked from max_baloon. --- src/qemu/qemu_command.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c8f7df2..71c220f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9219,8 +9219,19 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } - if (mlock) - virCommandSetMaxMemLock(cmd, def->mem.hard_limit * 1024); + if (mlock) { + unsigned long long memKB; + + /* VFIO requires all of the guest's memory to be + * locked resident, plus some amount for IO + * space. Alex Williamson suggested adding 1GiB for IO + * space just to be safe (some finer tuning might be + * nice, though). + */ + memKB = def->mem.hard_limit ? + def->mem.hard_limit : def->mem.max_balloon + 1024 * 1024; + virCommandSetMaxMemLock(cmd, memKB * 1024); + } virObjectUnref(cfg); return cmd; -- 1.8.1.5

3 2

[libvirt] [PATCH] qemuSetupMemoryCgroup: Handle hard_limit properly
by Michal Privoznik 20 Aug '13

20 Aug '13

Since 16bcb3 we have a regression. The hard_limit is set unconditionally. By default, the limit is zero. Hence, if user hasn't configured any, we set the zero in cgroup subsystem making the kernel kill the corresponding qemu process immediately. The proper fix is to set hard_limit iff user has configure any. --- src/qemu/qemu_cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 9673e8e..e27945e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -428,7 +428,8 @@ qemuSetupMemoryCgroup(virDomainObjPtr vm) } } - if (virCgroupSetMemoryHardLimit(priv->cgroup, vm->def->mem.hard_limit) < 0) + if (vm->def->mem.hard_limit != 0 && + virCgroupSetMemoryHardLimit(priv->cgroup, vm->def->mem.hard_limit) < 0) return -1; if (vm->def->mem.soft_limit != 0 && -- 1.8.1.5

4 5

[libvirt] [PATCH 0/3] Clean up usage of vshStringToArray
by Peter Krempa 20 Aug '13

20 Aug '13

Usage of vshStringToArray in virsh was problematic in a few places. Clean it up to avoid a few memleaks. Also improve an error message. Peter Krempa (3): virsh: modify vshStringToArray to duplicate the elements too virsh-pool: Improve error message in cmdPoolList virsh: Don't leak list of volumes when undefining domain with storage tools/virsh-domain.c | 121 ++++++++++++++++++++++++------------------------- tools/virsh-nodedev.c | 18 ++------ tools/virsh-pool.c | 12 ++--- tools/virsh-snapshot.c | 10 +--- tools/virsh.c | 8 ++-- tools/virsh.h | 1 + 6 files changed, 76 insertions(+), 94 deletions(-) -- 1.8.3.2

2 10

[libvirt] [RFC] QCOW2 version defaults in qemu-img and libvirt
by Ján Tomko 20 Aug '13

20 Aug '13

Hello! QEMU is switching the default QCOW2 version from v2 (compat=0.10) to v3 (compat=1.1) [1] Currently, libvirt only specifies the compat=0.10 option if it was explicitly requested (to avoid parsing qemu-img help output [2]) and assumes the format to be v2 when it calls qemu-img without the compat option. With this change in qemu-img a volume with no <features> or <compat> elements will be created as qcow2v3 with the new qemu-img (but the compat level won't be reflected in volume XML until refresh). According to the IRC conversation with Eric Blake and Kevin Wolf (bug I filed: [3]), it seems we should: * always specify the compat option if it's supported by qemu-img (which would solve the problem mentioned above) * provide an option in qemu.conf to set the default compatibility level, defaulting to 1.1 to make it easier to use the new format This would probably require a new storage.conf file, since the storage driver doesn't have access to the qemu driver config, but: does this seem reasonable? Should we add a default feature list (for the only feature) as well? Jan [1] http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg02549.html [2] https://www.redhat.com/archives/libvir-list/2013-February/msg00301.html [3] https://bugzilla.redhat.com/show_bug.cgi?id=997977

2 1

Re: [libvirt] [PATCH v2]LXC: Helper function for checking ownership of dir when userns enabled
by Chen HanXiao 20 Aug '13

20 Aug '13

Hi Any comments? Thanks > -----Original Message----- > From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] > On Behalf Of Chen HanXiao > Sent: Wednesday, August 14, 2013 9:30 AM > To: 'Daniel P. Berrange' > Cc: libvir-list(a)redhat.com > Subject: Re: [libvirt] [PATCH v2]LXC: Helper function for checking ownership of > dir when userns enabled > > > > > -----Original Message----- > > From: Daniel P. Berrange [mailto:berrange@redhat.com] > > Sent: Saturday, August 10, 2013 12:54 AM > > To: Chen Hanxiao > > Cc: libvir-list(a)redhat.com > > Subject: Re: [libvirt] [PATCH v2]LXC: Helper function for checking ownership of > > dir when userns enabled > > > > On Fri, Aug 09, 2013 at 04:05:58PM +0800, Chen Hanxiao wrote: > > > From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> > > > > > > If we enable userns, the ownership of dir we provided for containers > > > should match the uid/gid in idmap. > > > Currently, the debug log is very implicit or misleading sometimes. > > > This patch will help clarify this for us when using > > > debug log or virsh. > > > > I do recall hitting some permission issue once, but can't remember > > just what it was. Can you describe exactly how to reproduce the > > problem ? > > > > 1) Enable user namespace in kernel > 2) Add idmap for container > 3) Don't change the ownership of devices/ filesystem/ source dir ( leave > them to 'root' for instance) > 4) Start the container > > Usually I got an input/output error by virsh, which is not a good hint. > > > > > Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> > > > --- > > > src/lxc/lxc_container.c | 46 > > ++++++++++++++++++++++++++++++++++++++++++++++ > > > 1 files changed, 46 insertions(+), 0 deletions(-) > > > > > > diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c > > > index b910b10..2ccdc61 100644 > > > --- a/src/lxc/lxc_container.c > > > +++ b/src/lxc/lxc_container.c > > > @@ -1815,6 +1815,49 @@ lxcNeedNetworkNamespace(virDomainDefPtr > > def) > > > return false; > > > } > > > > > > +/* > > > + * Helper function for helping check > > > + * whether we have enough privilege > > > + * to operate the source dir when userns enabled > > > + * @vmDef: pointer to vm definition structure > > > + * Returns 0 on success or -1 in case of error > > > + */ > > > +static int > > > +lxcContainerUsernsSrcOwnershipCheck(virDomainDefPtr vmDef) > > > +{ > > > + struct stat buf; > > > + size_t i; > > > + uid_t uid; > > > + gid_t gid; > > > + > > > + VIR_DEBUG("vmDef->nfss %d", (int)vmDef->nfss); > > > + for (i = 0; i < vmDef->nfss; i++) { > > > + VIR_DEBUG("dst is %s, src is %s", > > > + vmDef->fss[i]->dst, > > > + vmDef->fss[i]->src); > > > + > > > + uid = vmDef->idmap.uidmap[0].target; > > > + gid = vmDef->idmap.gidmap[0].target; > > > + > > > + if (lstat(vmDef->fss[i]->src, &buf) < 0) { > > > + virReportSystemError(errno, _("Cannot access '%s'"), > > > + vmDef->fss[i]->src); > > > + return -1; > > > + } else if (uid != buf.st_uid || gid != buf.st_gid) { > > > + VIR_DEBUG("In userns uid is %d, gid is %d\n", > > > + uid, gid); > > > + errno = EINVAL; > > > + > > > + virReportSystemError(errno, > > > + _("[userns] Src dir '%s' does not > > belong to uid/gid: %d/%d"), > > > + vmDef->fss[i]->src, uid, gid); > > > + return -1; > > > + } > > > + } > > > + > > > + return 0; > > > +} > > > + > > > /** > > > * lxcContainerStart: > > > * @def: pointer to virtual machine structure > > > @@ -1866,6 +1909,9 @@ int lxcContainerStart(virDomainDefPtr def, > > > if (userns_supported()) { > > > VIR_DEBUG("Enable user namespace"); > > > cflags |= CLONE_NEWUSER; > > > + if (lxcContainerUsernsSrcOwnershipCheck(def) < 0) { > > > + return -1; > > > + } > > > } else { > > > virReportSystemError(VIR_ERR_CONFIG_UNSUPPORTED, > > "%s", > > > _("Kernel doesn't support user > > namespace")); > > > > > > Daniel > > -- > > |: http://berrange.com -o- > > http://www.flickr.com/photos/dberrange/ :| > > |: http://libvirt.org -o- > > http://virt-manager.org :| > > |: http://autobuild.org -o- > > http://search.cpan.org/~danberr/ :| > > |: http://entangle-photo.org -o- > > http://live.gnome.org/gtk-vnc :| > > > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list

1 0

[libvirt] [PATCH 0/3] virt-*-validate cleanups
by Eric Blake 20 Aug '13

20 Aug '13

Since I complained about virt-login-shell not having --help or --version, I figured I'd better audit our other shipping executable files. In the process, I found that we have been unable to auto-validate <domainsnapshot> objects, among others. Eric Blake (3): virt-xml-validate: add --help/--version option virt-xml-validate: add missing schemas virt-pki-validate: add --help/--version option tools/Makefile.am | 10 ++++---- tools/virt-pki-validate.in | 45 +++++++++++++++++++++++++++++++++++- tools/virt-xml-validate.in | 57 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 102 insertions(+), 10 deletions(-) -- 1.8.3.1

2 10

[libvirt] [PATCH] docs: Clean 09adfdc62de2b up
by Michal Privoznik 19 Aug '13

19 Aug '13

--- docs/formatdomain.html.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 4a927cc..12a756c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -677,8 +677,9 @@ <dd> The optional <code>hard_limit</code> element is the maximum memory the guest can use. The units for this value are kibibytes (i.e. blocks of 1024 bytes). <strong>However, users of QEMU and KVM are strongly - advised not to set this limit as domain may get killed by the kernel. - To determine the memory needed for a process to run is + advised not to set this limit as domain may get killed by the kernel + if the guess is too low. To determine the memory needed for a process + to run is an <a href="http://en.wikipedia.org/wiki/Undecidable_problem"> undecidable problem</a>.</strong></dd> <dt><code>soft_limit</code></dt> -- 1.8.1.5

2 1

[libvirt] [PATCH] storage: Update pool metadata after adding/removing/resizing volume
by Osier Yang 19 Aug '13

19 Aug '13

RHEL6.5: https://bugzilla.redhat.com/show_bug.cgi?id=965442 One has to refresh the pool to get the correct pool info after adding/removing/resizing a volume, this updates the pool metadata (allocation, available) after those operation are done. v1: https://www.redhat.com/archives/libvir-list/2013-May/msg01957.html --- src/storage/storage_driver.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 72786dd..7908ba6 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1507,6 +1507,7 @@ storageVolCreateXML(virStoragePoolPtr obj, virStorageBackendPtr backend; virStorageVolDefPtr voldef = NULL; virStorageVolPtr ret = NULL, volobj = NULL; + virStorageVolDefPtr buildvoldef = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); @@ -1565,20 +1566,19 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; } - if (backend->buildVol) { - int buildret; - virStorageVolDefPtr buildvoldef = NULL; + if (VIR_ALLOC(buildvoldef) < 0) { + voldef = NULL; + goto cleanup; + } - if (VIR_ALLOC(buildvoldef) < 0) { - voldef = NULL; - goto cleanup; - } + /* Make a shallow copy of the 'defined' volume definition, since the + * original allocation value will change as the user polls 'info', + * but we only need the initial requested values + */ + memcpy(buildvoldef, voldef, sizeof(*voldef)); - /* Make a shallow copy of the 'defined' volume definition, since the - * original allocation value will change as the user polls 'info', - * but we only need the initial requested values - */ - memcpy(buildvoldef, voldef, sizeof(*voldef)); + if (backend->buildVol) { + int buildret; /* Drop the pool lock during volume allocation */ pool->asyncjobs++; @@ -1595,7 +1595,6 @@ storageVolCreateXML(virStoragePoolPtr obj, pool->asyncjobs--; voldef = NULL; - VIR_FREE(buildvoldef); if (buildret < 0) { virStoragePoolObjUnlock(pool); @@ -1606,6 +1605,10 @@ storageVolCreateXML(virStoragePoolPtr obj, } + /* Update pool metadata */ + pool->def->allocation += buildvoldef->allocation; + pool->def->available -= buildvoldef->allocation; + VIR_INFO("Creating volume '%s' in storage pool '%s'", volobj->name, pool->def->name); ret = volobj; @@ -1615,6 +1618,7 @@ storageVolCreateXML(virStoragePoolPtr obj, cleanup: virObjectUnref(volobj); virStorageVolDefFree(voldef); + virStorageVolDefFree(buildvoldef); if (pool) virStoragePoolObjUnlock(pool); return ret; @@ -1770,6 +1774,10 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } + /* Updating pool metadata */ + pool->def->allocation += newvol->allocation; + pool->def->available -= newvol->allocation; + VIR_INFO("Creating volume '%s' in storage pool '%s'", volobj->name, pool->def->name); ret = volobj; @@ -2013,6 +2021,11 @@ storageVolResize(virStorageVolPtr obj, goto out; vol->capacity = abs_capacity; + + /* Update pool metadata */ + pool->def->allocation += (abs_capacity - vol->capacity); + pool->def->available -= (abs_capacity - vol->capacity); + ret = 0; out: @@ -2356,6 +2369,10 @@ storageVolDelete(virStorageVolPtr obj, if (backend->deleteVol(obj->conn, pool, vol, flags) < 0) goto cleanup; + /* Update pool metadata */ + pool->def->allocation -= vol->allocation; + pool->def->available += vol->allocation; + for (i = 0; i < pool->volumes.count; i++) { if (pool->volumes.objs[i] == vol) { VIR_INFO("Deleting volume '%s' from storage pool '%s'", -- 1.8.1.4

6 6

[libvirt] [PATCH 0/8] virsh: More intelligent auto-completion
by Tomas Meszaros 19 Aug '13

19 Aug '13

Hi, this patch series is a prototype for my GSoC project (Michal Privoznik is my mentor). I'm working on virsh auto-completion, trying to make it more "intelligent". At this stage, prototype is capable of command and option completion. Three completer functions are currently implemented so you can test it. If it turns out that this prototype is good enough, I will implement more completer functions. Tomas Meszaros (8): virsh: Add vshCmdCompleter and vshOptCompleter virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter virsh: Improve readline generators and readline completion virsh: Add completer functions to domManaggementCmds virsh: Add completer functions to snapshotCmds virsh: Add completer functions to domMonitoringCmds tools/virsh-domain-monitor.c | 32 ++- tools/virsh-domain.c | 240 +++++++++++++++----- tools/virsh-snapshot.c | 45 +++- tools/virsh.c | 507 +++++++++++++++++++++++++++++++++++++++++-- tools/virsh.h | 11 + 5 files changed, 742 insertions(+), 93 deletions(-) -- 1.8.3.1

3 14

[libvirt] [PATCH] virBitmapParse: Fix behavior in case of error
by Peter Krempa 19 Aug '13

19 Aug '13

Re-arrange the code so that the returned bitmap is always initialized to NULL even on early failures and return an error message as some callers are already expecting it. --- src/util/virbitmap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 47c678e..5d0655c 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -298,23 +298,21 @@ virBitmapParse(const char *str, size_t bitmapSize) { bool neg = false; - const char *cur; + const char *cur = str; char *tmp; size_t i; int start, last; - if (!str) + if (!(*bitmap = virBitmapNew(bitmapSize))) return -1; - cur = str; - virSkipSpaces(&cur); + if (!str) + goto error; - if (*cur == 0) - return -1; + virSkipSpaces(&cur); - *bitmap = virBitmapNew(bitmapSize); - if (!*bitmap) - return -1; + if (*cur == '\0') + goto error; while (*cur != 0 && *cur != terminator) { /* @@ -384,6 +382,8 @@ virBitmapParse(const char *str, return virBitmapCountBits(*bitmap); error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to parse bitmap '%s'", str)); virBitmapFree(*bitmap); *bitmap = NULL; return -1; -- 1.8.3.2

2 1

[libvirt] [PATCH] qemu: Drop qemuDomainMemoryLimit
by Michal Privoznik 19 Aug '13

19 Aug '13

This function is to guess the correct limit for maximal memory usage by qemu for given domain. This can never be guessed correctly, not to mention all the pains and sleepless nights this code has caused. Once somebody discovers algorithm to solve the Halting Problem, we can compute the limit algorithmically. But till then, this code should never see the light of the release again. --- src/qemu/qemu_cgroup.c | 3 +-- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 49 ------------------------------------------------- src/qemu/qemu_domain.h | 2 -- src/qemu/qemu_hotplug.c | 2 +- 5 files changed, 3 insertions(+), 55 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index dc949db..9673e8e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -428,8 +428,7 @@ qemuSetupMemoryCgroup(virDomainObjPtr vm) } } - if (virCgroupSetMemoryHardLimit(priv->cgroup, - qemuDomainMemoryLimit(vm->def)) < 0) + if (virCgroupSetMemoryHardLimit(priv->cgroup, vm->def->mem.hard_limit) < 0) return -1; if (vm->def->mem.soft_limit != 0 && diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b811e1d..a0a1773 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9220,7 +9220,7 @@ qemuBuildCommandLine(virConnectPtr conn, } if (mlock) - virCommandSetMaxMemLock(cmd, qemuDomainMemoryLimit(def) * 1024); + virCommandSetMaxMemLock(cmd, def->mem.hard_limit * 1024); virObjectUnref(cfg); return cmd; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 393af6b..7f4d17d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2306,55 +2306,6 @@ cleanup: return ret; } - -unsigned long long -qemuDomainMemoryLimit(virDomainDefPtr def) -{ - unsigned long long mem; - size_t i; - - if (def->mem.hard_limit) { - mem = def->mem.hard_limit; - } else { - /* If there is no hard_limit set, compute a reasonable one to avoid - * system thrashing caused by exploited qemu. A 'reasonable - * limit' has been chosen: - * (1 + k) * (domain memory + total video memory) + (32MB for - * cache per each disk) + F - * where k = 0.5 and F = 400MB. The cache for disks is important as - * kernel cache on the host side counts into the RSS limit. - * Moreover, VFIO requires some amount for IO space. Alex Williamson - * suggested adding 1GiB for IO space just to be safe (some finer - * tuning might be nice, though). - * - * Technically, the disk cache does not have to be included in - * RLIMIT_MEMLOCK but it doesn't hurt as it's just an upper limit and - * it makes this function and its usage simpler. - */ - mem = def->mem.max_balloon; - for (i = 0; i < def->nvideos; i++) - mem += def->videos[i]->vram; - mem *= 1.5; - mem += def->ndisks * 32768; - mem += 409600; - - for (i = 0; i < def->nhostdevs; i++) { - virDomainHostdevDefPtr hostdev = def->hostdevs[i]; - if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == - VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && - hostdev->source.subsys.u.pci.backend == - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { - mem += 1024 * 1024; - break; - } - } - } - - return mem; -} - - int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, virDomainObjPtr vm) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 0a4a51e..21f116c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -365,8 +365,6 @@ extern virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks; extern virDomainXMLNamespace virQEMUDriverDomainXMLNamespace; extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig; -unsigned long long qemuDomainMemoryLimit(virDomainDefPtr def); - int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, virDomainObjPtr vm); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c9748d9..fa64dd7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1030,7 +1030,7 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, */ vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; virProcessSetMaxMemLock(vm->pid, - qemuDomainMemoryLimit(vm->def) * 1024); + vm->def->mem.hard_limit * 1024); vm->def->hostdevs[vm->def->nhostdevs--] = NULL; } -- 1.8.1.5

6 10

[libvirt] [PATCHv3 0/3] Fix two issues when DBus isn't enabled or compiled in
by Peter Krempa 19 Aug '13

19 Aug '13

Fix regression in starting VMs and inability to start libvirtd when firewalld support is compiled in. Diff to v2: virDBusHasSystemBus is now a bool function and adaptations to that. Peter Krempa (3): virdbus: Add virDBusHasSystemBus() virsystemd: Don't fail to start VM if DBus isn't available or compiled in nwfilter: Don't fail to start if DBus isn't available src/libvirt_private.syms | 1 + src/nwfilter/nwfilter_driver.c | 9 +++++++-- src/util/virdbus.c | 33 ++++++++++++++++++++++++++++++--- src/util/virdbus.h | 1 + src/util/virsystemd.c | 6 ++++-- 5 files changed, 43 insertions(+), 7 deletions(-) -- 1.8.3.2

2 7

[libvirt] [PATCH] virbitmaptest: Shut coverity up in case of broken test
by Peter Krempa 19 Aug '13

19 Aug '13

Coverity reported a memleak in the test added in 7efd5fd1b02. In case the code will be broken and the code will actually parse a faulty bitmap the resulting pointer would be leaked. Free it although that shouldn't ever happen. --- tests/virbitmaptest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index c56d6fa..e00b0a0 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -492,6 +492,7 @@ test9(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: + virBitmapFree(bitmap); return ret; } -- 1.8.3.2

3 3

[libvirt] [PATCH] docs: Discourage users to set hard_limit
by Michal Privoznik 19 Aug '13

19 Aug '13

In one of my previous patches I am removing the hard_limit heuristic to guess the correct value if none set. However, it turned out, this limit is hard to guess even for users. We should advise them to not set the limit as their domains may be OOM killed. Sigh. --- docs/formatdomain.html.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 83d551a..93234a4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -676,7 +676,10 @@ <dt><code>hard_limit</code></dt> <dd> The optional <code>hard_limit</code> element is the maximum memory the guest can use. The units for this value are kibibytes (i.e. blocks - of 1024 bytes)</dd> + of 1024 bytes). <strong>However, users are strongly advised not to set + this limit as domain may get killed by the kernel. To determine the + memory needed for a process to run is <a href="http://en.wikipedia.org/wiki/Undecidable_problem"> + undecidable problem</a>.</strong></dd> <dt><code>soft_limit</code></dt> <dd> The optional <code>soft_limit</code> element is the memory limit to enforce during memory contention. The units for this value are -- 1.8.1.5

3 3

[libvirt] virtlockd max_clients limitation
by David Weber 19 Aug '13

19 Aug '13

Hi, we recently ran into a problem when trying to start more than 20 guests if direct locking with virtlockd was enabled. The error message locked like this: # start test7 error: Failed to start domain test7 error: Cannot recv data: Connection reset by peer Our research indicated there is a max_clients parameter set in src/locking/lock_daemon.c which causes the limitation. Simply increasing this number works as a workaround. I don't have a deep understanding of the code, so I don't know if there is a bug and the connection should be dropped after the lock is set or if max_clients really is the way to go. If the latter I guess max_clients should be configurable like in virtlockd or at least be higher than 20 :) Libvirt version 1.1.1 Cheers, David >From 5187231a973a9956723683c7fad14c8bb3dfcac2 Mon Sep 17 00:00:00 2001 From: David Weber <wb(a)munzinger.de> Date: Sun, 18 Aug 2013 16:16:36 +0200 Subject: [PATCH] Increase virtlockd max clients --- src/locking/lock_daemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index c4c1727..d96d0fc 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c virLockDaemonNew(bool privileged) return NULL; } - if (!(lockd->srv = virNetServerNew(1, 1, 0, 20, + if (!(lockd->srv = virNetServerNew(1, 1, 0, 100, -1, 0, false, NULL, virLockDaemonClientNew, -- 1.8.1.2

3 6

[libvirt] [PATCH glib] Remove dead cleanup code in object fetch_list helpers
by Daniel P. Berrange 19 Aug '13

19 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The fetch_list helper cleanup code iterates over the elements in 'lst' array free'ing each one. This is dead code, however, since the only way to get there is from codepaths which do not populate 'lst' elements. This fixes two coverity DEADCODE reports Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- libvirt-gobject/libvirt-gobject-storage-pool.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 5c8eb16..687a185 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -719,11 +719,7 @@ static gchar ** fetch_list(virConnectPtr vconn, return lst; error: - if (lst != NULL) { - for (i = 0 ; i < n; i++) - g_free(lst[i]); - g_free(lst); - } + g_free(lst); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index e02adc8..aa27872 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -347,11 +347,7 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, return lst; error: - if (lst != NULL) { - for (i = 0 ; i < n; i++) - g_free(lst[i]); - g_free(lst); - } + g_free(lst); return NULL; } -- 1.8.3.1

3 3

[libvirt] [PATCHv2 0/3] Fix two DBus related failures
by Peter Krempa 19 Aug '13

19 Aug '13

Some places in the code assumed that either DBus was compiled in or running: 1: systemd cgroup code failed to start a VM on hosts without DBus installed or running 2: nwfilter driver failed to initialize on hosts without DBus running This series fixes those issues as we have fallbacks in case DBus isn't available that we can use. Peter Krempa (3): virdbus: Add virDBusHasSystemBus() virsystemd: Don't fail to start VM if DBus isn't available or compiled in nwfilter: Don't fail to start if DBus isn't available src/libvirt_private.syms | 1 + src/nwfilter/nwfilter_driver.c | 8 ++++++-- src/util/virdbus.c | 34 +++++++++++++++++++++++++++++++--- src/util/virdbus.h | 1 + src/util/virsystemd.c | 4 ++-- 5 files changed, 41 insertions(+), 7 deletions(-) -- 1.8.3.2

2 5

[libvirt] virDomainAttachDevice error during disk hotplug
by Deepak C Shetty 19 Aug '13

19 Aug '13

Hi All, I am trying to do a hotplug of a disk from VDSM (which uses libvirt to get things done). I hit the below error "operation failed: open disk image file failed" comign from virDomainAttachDevice. Some background: 1) The qemu-img create cmd I use (inside vdsm) to create the file being hotplugged is /usr/bin/qemu-img create -f qcow2 -F qcow2 -b /rhev/data-center/000065de-04b8-42e2-986c-2de664708be7/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399 /var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399' (cwd /var/run/vdsm) I even tried using the rel. backing path instead of abs. path as below.. /usr/bin/qemu-img create -f qcow2 -F qcow2 -b ../../../rhev/data-center/000065de-04b8-42e2-986c-2de664708be7/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399 /var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399' (cwd /var/run/vdsm) but hit the same error during hotplug operation 2) qemu-img info /var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399 image: /var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399 file format: qcow2 virtual size: 3.8G (4096000000 bytes) disk size: 196K cluster_size: 65536 backing file: /rhev/data-center/000065de-04b8-42e2-986c-2de664708be7/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399 backing file format: qcow2 3) ls -l /rhev/data-center/000065de-04b8-42e2-986c-2de664708be7/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399 -r--r-----. 1 vdsm kvm 197120 Aug 10 11:59 /rhev/data-center/000065de-04b8-42e2-986c-2de664708be7/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399 4) libvirtd.log snippets: 2013-08-10 11:19:41.766+0000: 1103: debug : virDomainAttachDevice:9820 : dom=0x7f92f4003f20, (VM: name=dpk_BR_vm, uuid=9999017d-1278-4bfb-8129-62bded257399), xml=<disk device="disk" snapshot="no" type="file"> <source file="/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399"/> <target bus="virtio" dev="vdb"/> <serial>22224c45-6504-4ea1-bd24-12340017dd32</serial> <driver cache="none" error_policy="stop" io="threads" name="qemu" type="qcow2"/> </disk> 2013-08-10 11:19:41.766+0000: 1103: debug : qemuDomainObjBeginJobInternal:958 : Starting job: modify (async=none) 2013-08-10 11:19:41.766+0000: 1103: debug : virStorageFileGetMetadata:1007 : path=/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399 format=9 uid=107 gid=107 probe=0 2013-08-10 11:19:41.766+0000: 1103: debug : virStorageFileGetMetadataRecurse:939 : path=/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399 format=9 uid=107 gid=107 probe=0 2013-08-10 11:19:41.767+0000: 1103: debug : virStorageFileGetMetadataInternal:687 : path=/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399, fd=25, format=9 2013-08-10 11:19:41.770+0000: 1103: debug : virStorageFileGetMetadataRecurse:939 : path=/home/dpkshetty/libSM_disk/localstoragedomain/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399 format=9 uid=107 gid=107 probe=0 2013-08-10 11:19:41.770+0000: 1103: debug : virStorageFileGetMetadataInternal:687 : path=/home/dpkshetty/libSM_disk/localstoragedomain/11112d24-4cda-4200-8f6d-a1d8362c70fd/images/22224c45-6504-4ea1-bd24-12340017dd32/3333017d-1278-4bfb-8129-62bded257399, fd=25, format=9 2013-08-10 11:19:41.770+0000: 1103: debug : qemuDomainPCIAddressGetNextSlot:1826 : Found free PCI slot 0000:00:05 2013-08-10 11:19:41.770+0000: 1103: debug : qemuDomainPCIAddressReserveSlot:1710 : Reserving PCI slot 0000:00:05.0 2013-08-10 11:19:41.770+0000: 1103: debug : qemuMonitorAddDrive:2756 : mon=0x7f92f0007830 drive=file=/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399,if=none,id=drive-virtio-disk1,format=qcow2,serial=22224c45-6504-4ea1-bd24-12340017dd32,cache=none,werror=stop,rerror=stop,aio=threads 2013-08-10 11:19:41.770+0000: 1103: debug : qemuMonitorSend:887 : QEMU_MONITOR_SEND_MSG: mon=0x7f92f0007830 msg={"execute":"human-monitor-command","arguments":{"command-line":"drive_add dummy file=/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399,if=none,id=drive-virtio-disk1,format=qcow2,serial=22224c45-6504-4ea1-bd24-12340017dd32,cache=none,werror=stop,rerror=stop,aio=threads"},"id":"libvirt-67"}^M fd=-1 2013-08-10 11:19:41.771+0000: 1091: debug : qemuMonitorIOWrite:453 : QEMU_MONITOR_IO_WRITE: mon=0x7f92f0007830 buf={"execute":"human-monitor-command","arguments":{"command-line":"drive_add dummy file=/var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399,if=none,id=drive-virtio-disk1,format=qcow2,serial=22224c45-6504-4ea1-bd24-12340017dd32,cache=none,werror=stop,rerror=stop,aio=threads"},"id":"libvirt-67"}^M len=292 ret=292 errno=11 2013-08-10 11:19:41.772+0000: 1091: debug : qemuMonitorIOProcess:345 : QEMU_MONITOR_IO_PROCESS: mon=0x7f92f0007830 buf={"return": "could not open disk image /var/run/vdsm/3333017d-1278-4bfb-8129-62bded257399: Invalid argument\r\n", "id": "libvirt-67"}^M len=134 2013-08-10 11:19:41.772+0000: 1103: error : qemuMonitorTextAddDrive:2697 : operation failed: open disk image file failed 2013-08-10 11:19:41.773+0000: 1103: debug : qemuDomainObjEndJob:1070 : Stopping job: modify (async=none) --------------- Any hints on what could be the issues will help. I can try out few things, if someone could provide suggestions. thanx, deepak

3 11

[libvirt] [PATCH sandbox 0/9] Fix misc coverity error reports
by Daniel P. Berrange 19 Aug '13

19 Aug '13

This series aims to fix all the issues coverity identified with libvirt-sandbox. No critical issues found - just dead code, resource leaks and some missing return checks and a minor crash in CLI tool parsing.

1 10

[libvirt] [PATCH] Consistently use 'CANCELED' spelling in public API
by Christophe Fergeau 19 Aug '13

19 Aug '13

Most constant names in libvirt public API are using the 'CANCELED' spelling, except for VIR_DOMAIN_JOB_CANCELLED and VIR_ERR_AUTH_CANCELLED. This commit changes the spelling used by these 2 symbols to make it consistant with the rest of the API. For backwards compatibility, 2 #define are introduced using the old spelling (with 2 'L'). Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- include/libvirt/libvirt.h.in | 10 +++++++++- include/libvirt/virterror.h | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 52ac95d..91efa8c 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4031,13 +4031,21 @@ typedef enum { VIR_DOMAIN_JOB_UNBOUNDED = 2, /* Job without a finite completion time */ VIR_DOMAIN_JOB_COMPLETED = 3, /* Job has finished, but isn't cleaned up */ VIR_DOMAIN_JOB_FAILED = 4, /* Job hit error, but isn't cleaned up */ - VIR_DOMAIN_JOB_CANCELLED = 5, /* Job was aborted, but isn't cleaned up */ + VIR_DOMAIN_JOB_CANCELED = 5, /* Job was aborted, but isn't cleaned up */ #ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_JOB_LAST #endif } virDomainJobType; +/** + * VIR_DOMAIN_JOB_CANCELLED: + * + * Deprecated name for VIR_DOMAIN_JOB_CANCELED. Provided for backwards + * compatibility. + */ +#define VIR_DOMAIN_JOB_CANCELLED VIR_DOMAIN_JOB_CANCELED + typedef struct _virDomainJobInfo virDomainJobInfo; typedef virDomainJobInfo *virDomainJobInfoPtr; struct _virDomainJobInfo { diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index c1960c8..b525f96 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -282,7 +282,7 @@ typedef enum { risky domain snapshot revert */ VIR_ERR_OPERATION_ABORTED = 78, /* operation on a domain was canceled/aborted by user */ - VIR_ERR_AUTH_CANCELLED = 79, /* authentication cancelled */ + VIR_ERR_AUTH_CANCELED = 79, /* authentication cancelled */ VIR_ERR_NO_DOMAIN_METADATA = 80, /* The metadata is not present */ VIR_ERR_MIGRATE_UNSAFE = 81, /* Migration is not safe */ VIR_ERR_OVERFLOW = 82, /* integer overflow */ @@ -299,6 +299,14 @@ typedef enum { } virErrorNumber; /** + * VIR_ERR_AUTH_CANCELLED: + * + * Deprecated name for VIR_ERR_AUTH_CANCELED. Provided for backwards + * compatibility. + */ +#define VIR_ERR_AUTH_CANCELLED VIR_ERR_AUTH_CANCELED + +/** * virErrorFunc: * @userData: user provided data for the error callback * @error: the error being raised. -- 1.8.3.1

2 2

[libvirt] [PATCH v4 0/4] Add startupPolicy attribute support for hard disks
by Guannan Ren 19 Aug '13

19 Aug '13

v3: https://www.redhat.com/archives/libvir-list/2013-June/thread.html v3 to v4: Rebase v2 to v3: Not only check disk source, startupPolicy should work if any backing file is missing. The commit 039a3283 break the limition of contiguous device boot orders, so I remove my previous patch about it. v1 to v2: Added relax schema for disk of block and dir type Removed original patch 3/5. The set of patches is trying to add 'startupPolicy' attribute support to the source element of hard disks. Policy levels are using the mandatory, requisite, optional levels as originally documented. For the 'optional' policy, there is a little difference from CDROM and Floppy which only drop its source path, for disks, if missing, the checking function will drop their definitions, because qemu doesn't allow missing source path for hard disk. Guannan Ren [PATCH v3 1/4] conf: add startupPolicy attribute for harddisk [PATCH v3 2/4] storage: report error rather than warning if backing files doesn't exist [PATCH v3 3/4] qemu: drop disk with 'optional' startupPolicy if it is not present [PATCH v3 4/4] security: restore DAC for every disk file in disk chain docs/schemas/domaincommon.rng | 6 ++++++ include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 20 +++++++++++++------- src/qemu/qemu_domain.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- src/qemu/qemu_process.c | 7 ------- src/security/security_dac.c | 15 ++++++++++++++- src/util/virstoragefile.c | 23 +++++++++++++++-------- tests/virstoragetest.c | 16 ++++++++-------- 8 files changed, 130 insertions(+), 77 deletions(-)

4 20

[libvirt] Adding network interfaces to VMs created on ESX hypervisor
by varun bhatnagar 19 Aug '13

19 Aug '13

Hi, I want to create/attach two "internal" and one "host-only" interface to my node created by libvirt on ESX hypervisor. Is it possible to do so? If yes can anyone send a template of xml file? If it is not possible then is there any alternative for this? Regards, Varun

1 0

[libvirt] [PATCH] Ensure that /dev exists in the container root filesystem
by Daniel P. Berrange 19 Aug '13

19 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If booting a container with a root FS that isn't the host's root, we must ensure that the /dev mount point exists. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 0ab4026..678a9d5 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -868,7 +868,7 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED, static int lxcContainerMountFSDev(virDomainDefPtr def, const char *stateDir) { - int ret; + int ret = -1; char *path = NULL; VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir); @@ -877,14 +877,24 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, stateDir, def->name)) < 0) return ret; + if (virFileMakePath("/dev") < 0) { + virReportSystemError(errno, "%s", + _("Cannot create /dev")); + goto cleanup; + } + VIR_DEBUG("Tring to move %s to /dev", path); - if ((ret = mount(path, "/dev", NULL, MS_MOVE, NULL)) < 0) { + if (mount(path, "/dev", NULL, MS_MOVE, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on /dev"), path); + goto cleanup; } + ret = 0; + +cleanup: VIR_FREE(path); return ret; } -- 1.8.3.1

3 2

[libvirt] [PATCH] util: Fix crash of libvirtd when running numatune with invalid nodeset
by Alex Jia 19 Aug '13

19 Aug '13

This issue is introduced by commit 0fc8909, the virBitmapIsSet() needs caller to ensure 'b < bitmap->max_bit', but it's lost in the virBitmapParse() caller, this will cause crash of libvirtd, with the patch, libvirtd no crash and can get a expected error "Failed to parse nodeset". How to reproduce? # virsh numatune foo --nodeset 1000000000 Actual result: error: Unable to change numa parameters error: End of file while reading data: Input/output error error: One or more references were leaked after disconnect from the hypervisor error: Failed to reconnect to the hypervisor GDB backtrace: Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7f80ee533700 (LWP 4156)] 0x00007f80fb1b8906 in virBitmapIsSet (str=<value optimized out>, terminator=0 '\000', bitmap=0x7f80ee532978, bitmapSize=<value optimized out>) at util/virbitmap.c:158 158 return !!(bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] & VIR_BITMAP_BIT(b)); (gdb) bt #0 0x00007f80fb1b8906 in virBitmapIsSet (str=<value optimized out>, terminator=0 '\000', bitmap=0x7f80ee532978, bitmapSize=<value optimized out>) at util/virbitmap.c:158 #1 virBitmapParse (str=<value optimized out>, terminator=0 '\000', bitmap=0x7f80ee532978, bitmapSize=<value optimized out>) at util/virbitmap.c:351 #2 0x00007f80e5e7ef6b in qemuDomainSetNumaParameters (dom=<value optimized out>, params=<value optimized out>, nparams=1, flags=2) at qemu/qemu_driver.c:8357 #3 0x00007f80fb2ad7c6 in virDomainSetNumaParameters (domain=0x7f80d4000930, params=0x7f80d4000b00, nparams=1, flags=0) at libvirt.c:4163 #4 0x00007f80fbcd17ec in remoteDispatchDomainSetNumaParameters (server=<value optimized out>, client=<value optimized out>, msg=<value optimized out>, rerr=0x7f80ee532ba0, args=<value optimized out>, ret=<value optimized out>) at remote_dispatch.h:7771 #5 remoteDispatchDomainSetNumaParametersHelper (server=<value optimized out>, client=<value optimized out>, msg=<value optimized out>, rerr=0x7f80ee532ba0, args=<value optimized out>, ret=<value optimized out>) at remote_dispatch.h:7741 #6 0x00007f80fb2f6518 in virNetServerProgramDispatchCall (prog=0x7f80fd33a990, server=0x7f80fd32f3e0, client=0x7f80fd33fe30, msg=0x7f80fd33e550) at rpc/virnetserverprogram.c:435 #7 virNetServerProgramDispatch (prog=0x7f80fd33a990, server=0x7f80fd32f3e0, client=0x7f80fd33fe30, msg=0x7f80fd33e550) at rpc/virnetserverprogram.c:305 #8 0x00007f80fb2f9dd6 in virNetServerProcessMsg (srv=<value optimized out>, client=0x7f80fd33fe30, prog=<value optimized out>, msg=0x7f80fd33e550) at rpc/virnetserver.c:165 #9 0x00007f80fb2fa9f3 in virNetServerHandleJob (jobOpaque=<value optimized out>, opaque=<value optimized out>) at rpc/virnetserver.c:186 #10 0x00007f80fb20210e in virThreadPoolWorker (opaque=<value optimized out>) at util/virthreadpool.c:144 #11 0x00007f80fb2016f6 in virThreadHelper (data=<value optimized out>) at util/virthreadpthread.c:161 #12 0x00007f80f8d857f1 in start_thread (arg=0x7f80ee533700) at pthread_create.c:301 #13 0x00007f80f86bb70d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:115 RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=997367 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- The caller virBitmapGetBit() can make sure 'b < bitmap->max_bit', so don't need to worry about higher caller for the virBitmapGetBit(), but the virBitmapParse() is called by many XML parser function, not sure which one can crash libvirtd with read-only client then probably require a CVE, I haven't a good way to check them now and only manually check them one by one. src/util/virbitmap.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 7e1cd02..edbfb30 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -337,6 +337,9 @@ virBitmapParse(const char *str, if (start < 0) goto parse_error; + if ((*bitmap)->max_bit <= start) + goto parse_error; + cur = tmp; virSkipSpaces(&cur); -- 1.7.1

3 3