- Devel - libvirt List Archives

[libvirt] [PATCH] autogen: work around BSD toolchain snafu
by Eric Blake 04 Dec '13

04 Dec '13

With my help on IRC, Roman Bogorodskiy identified a bug where the BSD autoconf wrapper script eats stdin[1], which in turn causes autopoint from gettext 0.18.3 to fail to find AM_GNU_GETTEXT_VERSION within configure.ac[2], with this error: ./bootstrap: autopoint --force autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using [1] http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184479 [2] http://git.sv.gnu.org/cgit/gettext.git/commit/gettext-tools/misc/autopoint.… We found a workaround - fake the use of an intl subdirectory long enough for autopoint to get what it wants from that fallback. This workaround may eventually move upstream into gnulib's bootstrap; when it does, we can remove the hack from libvirt's autogen.sh. * autogen.sh (bootstrap): Force autopoint to work even if autom4te doesn't. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I tested that this doesn't fall apart on Fedora 19 when running autogen.sh (autopoint 0.18.2, no autom4te wrapper), but would like feedback from Roman that it works for his broken toolchain setup. I'd also like feedback from gnulib whether we should fold a similar fix into gnulib's bootstrap, instead of applying this patch to libvirt. autogen.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/autogen.sh b/autogen.sh index 5aa1990..31e66c0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -88,9 +88,16 @@ if test -d .git || test -f .git; then echo cleaning up submodules... git submodule foreach 'git clean -dfqx && git reset --hard' fi + # work around broken BSD toolchain, where gettext 0.18.3 triggers + # a bug with the autom4te wrapper script eating stdin unless + # intl/VERSION exists, with contents comparable to configure.ac + mkdir -p intl + echo gettext-0.17 > intl/VERSION echo running bootstrap$no_git... ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \ || { echo "Failed to bootstrap, please investigate."; exit 1; } + rm intl/VERSION + rmdir -p intl fi fi -- 1.8.3.1

2 2

[libvirt] [PATCH] virThreadPool: Don't create joinable threads
by Michal Privoznik 04 Dec '13

04 Dec '13

Otherwise these threads won't clean after themselves, as we are not joining them: ==26697== 1,680 bytes in 5 blocks are possibly lost in loss record 913 of 942 ==26697== at 0x4C2BDE4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==26697== by 0x4011131: allocate_dtv (in /lib64/ld-2.16.so) ==26697== by 0x401176D: _dl_allocate_tls (in /lib64/ld-2.16.so) ==26697== by 0x8499602: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.16.so) ==26697== by 0x52F53E9: virThreadCreate (virthreadpthread.c:188) ==26697== by 0x52F5D4F: virThreadPoolNew (virthreadpool.c:221) ==26697== by 0x53F30DB: virNetServerNew (virnetserver.c:377) ==26697== by 0x11C6ED: main (libvirtd.c:1366) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virthreadpool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index b1e2c0c..cb9e390 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -197,7 +197,7 @@ virThreadPoolPtr virThreadPoolNew(size_t minWorkers, data->cond = &pool->cond; if (virThreadCreate(&pool->workers[i], - true, + false, virThreadPoolWorker, data) < 0) { goto error; @@ -219,7 +219,7 @@ virThreadPoolPtr virThreadPoolNew(size_t minWorkers, data->priority = true; if (virThreadCreate(&pool->prioWorkers[i], - true, + false, virThreadPoolWorker, data) < 0) { goto error; @@ -319,7 +319,7 @@ int virThreadPoolSendJob(virThreadPoolPtr pool, data->cond = &pool->cond; if (virThreadCreate(&pool->workers[pool->nWorkers - 1], - true, + false, virThreadPoolWorker, data) < 0) { VIR_FREE(data); -- 1.8.4.4

2 1

[libvirt] [PATCH v4] Pin guest to memory node on NUMA system
by Shivaprasad G Bhat 04 Dec '13

04 Dec '13

Version 4: cpuset/mems modification moved to a new funtion and removed duplicate code as per the comments on v3. Version 3: Addressed comments on V2. Version 2: Fixed the string formatting errors in v1. The patch contains the fix for defect 1009880 reported at redhat bugzilla. The root cause is, ever since the subcpusets(vcpu,emulator) were introduced, the parent cpuset cannot be modified to remove the nodes that are in use by the subcpusets. The fix is to break the memory node modification into three steps as to assign new nodes into the parent first. Change the nodes in the child nodes. Then remove the old nodes on the parent node. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 102 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67b549c..e2d4e97 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8134,6 +8134,84 @@ cleanup: } static int +qemuDomainSetNumaParamsLive(virDomainObjPtr vm, + virCapsPtr caps, + virBitmapPtr nodeset) +{ + virCgroupPtr cgroup_temp = NULL; + virBitmapPtr temp_nodeset = NULL; + qemuDomainObjPrivatePtr priv = vm->privateData; + char *nodeset_str = NULL; + size_t i = 0; + int ret = -1; + + if (vm->def->numatune.memory.mode != VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("change of nodeset for running domain " + "requires strict numa mode")); + goto cleanup; + } + + /*Get Exisitng nodeset values */ + if (virCgroupGetCpusetMems(priv->cgroup, &nodeset_str) < 0 || + virBitmapParse(nodeset_str, 0, &temp_nodeset, + VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + VIR_FREE(nodeset_str); + + for (i = 0; i < caps->host.nnumaCell; i++) { + bool result; + if (virBitmapGetBit(nodeset, i, &result) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to get cpuset bit values")); + goto cleanup; + } + if (result && (virBitmapSetBit(temp_nodeset, i) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set temporary cpuset bit values")); + goto cleanup; + } + } + + if (!(nodeset_str = virBitmapFormat(temp_nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + goto cleanup; + } + + if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) + goto cleanup; + VIR_FREE(nodeset_str); + + /* Ensure the cpuset string is formated before passing to cgroup */ + if (!(nodeset_str = virBitmapFormat(nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + goto cleanup; + } + + for (i = 0; i < priv->nvcpupids; i++) { + if (virCgroupNewVcpu(priv->cgroup, i, false, &cgroup_temp) < 0 || + virCgroupSetCpusetMems(cgroup_temp, nodeset_str) < 0) + goto cleanup; + virCgroupFree(&cgroup_temp); + } + + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0 || + virCgroupSetCpusetMems(cgroup_temp, nodeset_str) < 0 || + virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(nodeset_str); + virBitmapFree(temp_nodeset); + virCgroupFree(&cgroup_temp); + + return ret; +} + +static int qemuDomainSetNumaParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -8200,7 +8278,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } } else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) { virBitmapPtr nodeset = NULL; - char *nodeset_str = NULL; if (virBitmapParse(params[i].value.s, 0, &nodeset, @@ -8210,32 +8287,11 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (vm->def->numatune.memory.mode != - VIR_DOMAIN_NUMATUNE_MEM_STRICT) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("change of nodeset for running domain " - "requires strict numa mode")); - virBitmapFree(nodeset); - ret = -1; - continue; - } - - /* Ensure the cpuset string is formated before passing to cgroup */ - if (!(nodeset_str = virBitmapFormat(nodeset))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to format nodeset")); - virBitmapFree(nodeset); - ret = -1; - continue; - } - - if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) { + if (qemuDomainSetNumaParamsLive(vm, caps, nodeset) < 0) { virBitmapFree(nodeset); - VIR_FREE(nodeset_str); ret = -1; continue; } - VIR_FREE(nodeset_str); /* update vm->def here so that dumpxml can read the new * values from vm->def. */

2 1

[libvirt] [PATCH 0/5] Resolve some Coverity issues
by John Ferlan 04 Dec '13

04 Dec '13

Recent changes to various modules seems to have awoken Coverity and caused perusal through new paths. Hopefully this sends OK as I had to reset my environment after a fairly massive disk failure. Of course restarting from scratch could be a factor in why Coverity found the new issues. John Ferlan (5): nwfilter: Remove Coverity DEADCODE warning virnetserverclient: Remove Coverity DEADCODE warning virnetserverclient: Fix conditional change HAVE_SASL to WITH_SASL bridge_driver: Resolve Coverity CHECKED_RETURN warning storage_driver: Resolve Coverity CHECKED_RETURN warning src/network/bridge_driver.c | 3 ++- src/nwfilter/nwfilter_driver.c | 2 -- src/rpc/virnetserverclient.c | 10 ++++++++-- src/storage/storage_driver.c | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) -- 1.8.3.1

2 11

[libvirt] [PATCH] po/zh_CN.po : Fix 2 Chinese typo
by taget＠linux.vnet.ibm.com 04 Dec '13

04 Dec '13

From: Eli Qiao <taget(a)linux.vnet.ibm.com> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f7c0cb3..e52bda1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17598,7 +17598,7 @@ msgstr "读取 %s 日志输出时超出范围：%s" #: src/qemu/qemu_process.c:1542 #, c-format msgid "Process exited while reading %s log output: %s" -msgstr "读取 %s 日志输出时进程推出：%s" +msgstr "读取 %s 日志输出时进程退出：%s" #: src/qemu/qemu_process.c:1557 #, c-format @@ -17613,7 +17613,7 @@ msgstr "没有为设备 %s 分配 pty" #: src/qemu/qemu_process.c:1845 #, c-format msgid "process exited while connecting to monitor: %s" -msgstr "连接到监控程序时进程推出：%s" +msgstr "连接到监控程序时进程退出：%s" #: src/qemu/qemu_process.c:1938 msgid "Failed to convert nodeset to cpuset" -- 1.8.3.1

4 3

[libvirt] Perl binding Sys-Virt release 1.2.0
by Daniel P. Berrange 04 Dec '13

04 Dec '13

I am pleased to announce that release 1.2.0 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.2.0.tar.gz Changed in the 1.2.0 release: - Add all new constants in libvirt 1.2.0 - Fix reversed args for virNodeDeviceLookupSCSIHostByWWN Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, 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 :|

1 0

[libvirt] [PATCH] doc/Makefile.am: Add checking of XHTML1 DTD.
by taget＠linux.vnet.ibm.com 04 Dec '13

04 Dec '13

From: Eli Qiao <taget(a)linux.vnet.ibm.com> When generating html from html.in, even not install xhtml1-dtds.noarch, make will not return a error. which will lead 'make install' failed. This patch return error when creating html doc when doning make, will give user a correct error message. Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- docs/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9de3406..bc42353 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -223,7 +223,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --format --valid $< > $(srcdir)/$@ \ || { rm $(srcdir)/$@ && exit 1; }; \ - else echo "missing XHTML1 DTD" ; fi ; fi + else echo "missing XHTML1 DTD" && exit 1; fi ; fi %.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ @@ -249,7 +249,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in > /dev/null ; then \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ - else echo "missing XHTML1 DTD" ; fi ; fi + else echo "missing XHTML1 DTD" && exit 1; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ -- 1.8.3.1

3 2

[libvirt] question about libvirt.spec
by Jim Fehlig 03 Dec '13

03 Dec '13

While installing a libvirt-daemon package build from a slightly modified upstream spec file (e.g. fedora and rhel replaced with suse_version and sles_version), I noticed warnings such as "warning: user qemu does not exist - using root". %files of libvirt-daemon has several hypervisor-specific files and directories, e.g. %dir %attr(0750, %{qemu_user}, %{qemu_group}) ... but afaict libvirt-daemon has no dependency on a package that creates the qemu user:group (e.g. qemu or qemu-kvm). I thought about moving hypervisor-specific files to the libvirt-daemon-driver-<hypervisor> packages, but have a hunch they are in the libvirt-daemon package for a reason I'm not considering. Should these files and directories be moved to their respective libvirt-daemon-driver-<hypervisor> packages, making libvirt-daemon more hypervisor-neutral? Regards, Jim

2 2

[libvirt] [PATCH] src: Align make output
by Michal Privoznik 03 Dec '13

03 Dec '13

The make inserts six spaces instead of four: GEN access/viraccessapichecklxc.h GEN hyperv/hyperv_wmi.generated.h GEN access/viraccessapichecklxc.c GEN hyperv/hyperv_wmi.generated.c GEN hyperv/hyperv_wmi_classes.generated.typedef GEN hyperv/hyperv_wmi_classes.generated.h GEN hyperv/hyperv_wmi_classes.generated.c GEN libvirt_access_qemu.xml GEN libvirt_access.syms GEN libvirt_access_lxc.xml GEN libvirt_access_qemu.syms GEN libvirt_access_lxc.syms GEN libvirt_qemu.def GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typetostring GEN esx/esx_vi_types.generated.typefromstring GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_methods.generated.h GEN esx/esx_vi_methods.generated.c GEN esx/esx_vi_methods.generated.macro GEN esx/esx_vi.generated.h GEN esx/esx_vi.generated.c GEN libvirt_lxc.def Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/esx/esx_vi_generator.py | 4 ++-- src/hyperv/hyperv_wmi_generator.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 547eef6..0b75f18 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1321,9 +1321,9 @@ def is_known_type(type): def open_and_print(filename): if filename.startswith("./"): - print " GEN " + filename[2:] + print " GEN " + filename[2:] else: - print " GEN " + filename + print " GEN " + filename return open(filename, "wb") diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index 0c5d496..f767d54 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -193,9 +193,9 @@ class Property: def open_and_print(filename): if filename.startswith("./"): - print " GEN " + filename[2:] + print " GEN " + filename[2:] else: - print " GEN " + filename + print " GEN " + filename return open(filename, "wb") -- 1.8.4.4

2 1

[libvirt] [PATCHv1.5 00/27] Gluster snapshot support (RFC) and refactors
by Peter Krempa 03 Dec '13

03 Dec '13

This version was rebased on top of Eric's gluster pool series and a few small mistakes were fixed. As nobody actually reviewed the original posting I did not bother putting the differences in the patches. Peter Krempa (27): conf: Export virStorageVolType enum helper functions test: Implement fake storage pool driver in qemuxml2argv test qemuxml2argv: Add test to verify correct usage of disk type="volume" qemuxml2argv: Add test for disk type='volume' with iSCSI pools qemu: Split out formatting of network disk source URI qemu: Simplify call pattern of qemuBuildDriveURIString qemu: Use qemuBuildNetworkDriveURI to handle http/ftp and friends qemu: Migrate sheepdog source generation into common function qemu: Split out NBD command generation qemu: Unify formatting of RBD sources qemu: Refactor disk source string formatting conf: Support disk source formatting without needing a virDomainDiskDefPtr conf: Clean up virDomainDiskSourceDefFormatInternal conf: Split out seclabel formating code for disk source conf: Export disk source formatter and parser snapshot: conf: Use common parsing and formatting functions for source snapshot: conf: Fix NULL dereference when <driver> element is empty conf: Add functions to copy and free network disk source definitions qemu: snapshot: Detect internal snapshots also for sheepdog and RBD conf: Add helper do clear disk source authentication struct qemu: Clear old translated pool source qemu: snapshot: Touch up error message qemu: snapshot: Add functions similar to disk source pool translation qemu: snapshots: Declare supported and unsupported snapshot configs RFC: snapshot: Add support for specifying snapshot disk backing type RFC: conf: snapshot: Parse more snapshot information RFC: qemu: snapshot: Add support for external active snapshots on gluster src/conf/domain_conf.c | 261 ++++++--- src/conf/domain_conf.h | 25 + src/conf/snapshot_conf.c | 69 ++- src/conf/snapshot_conf.h | 14 +- src/libvirt_private.syms | 6 + src/qemu/qemu_command.c | 652 +++++++++++---------- src/qemu/qemu_command.h | 15 + src/qemu/qemu_conf.c | 156 +++-- src/qemu/qemu_conf.h | 8 + src/qemu/qemu_driver.c | 429 ++++++++++++-- .../qemuxml2argv-disk-source-pool-mode.args | 10 + .../qemuxml2argv-disk-source-pool-mode.xml | 4 +- .../qemuxml2argv-disk-source-pool.args | 8 + .../qemuxml2argv-disk-source-pool.xml | 2 +- tests/qemuxml2argvtest.c | 166 ++++++ 15 files changed, 1298 insertions(+), 527 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args -- 1.8.4.3

5 73