- 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

[libvirt] [libvirt-python] Use user requested python binary for setup.py
by Doug Goldstein 03 Dec '13

03 Dec '13

When setup.py is kicked off with a python interpreter other than the system 'python', (e.g. python2.7 setup.py build) the build process would switch to 'python' and not use python2.7 as requested by the user. We should always respect the user requested python interpreter and use it. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index ecbce1f..24d4cf2 100755 --- a/setup.py +++ b/setup.py @@ -122,10 +122,10 @@ class my_build(build): def run(self): apis = get_api_xml_files() - self.spawn(["python", "generator.py", "libvirt", apis[0]]) - self.spawn(["python", "generator.py", "libvirt-qemu", apis[1]]) + self.spawn([sys.executable, "generator.py", "libvirt", apis[0]]) + self.spawn([sys.executable, "generator.py", "libvirt-qemu", apis[1]]) if have_libvirt_lxc: - self.spawn(["python", "generator.py", "libvirt-lxc", apis[2]]) + self.spawn([sys.executable, "generator.py", "libvirt-lxc", apis[2]]) build.run(self) @@ -267,7 +267,7 @@ class my_test(Command): apis = get_api_xml_files() - self.spawn(["python", "sanitytest.py", self.build_platlib, apis[0]]) + self.spawn([sys.executable, "sanitytest.py", self.build_platlib, apis[0]]) class my_clean(clean): -- 1.8.3.2

3 3

[libvirt] [PATCH python] Fix use of virDomainEventRegister in python bindings
by Daniel P. Berrange 03 Dec '13

03 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If an app used the virDomainEventRegister binding instead of the virDomainEventRegisterAny binding, it would never have its callback invoked. This is because the code for dispatching from the C libvirt_virConnectDomainEventCallback method was totally fubar. If DEBUG macro was set in the python build the error would become visible "libvirt_virConnectDomainEventCallback dom_class is not a class!" The code in libvirt_virConnectDomainEventCallback was inexplicably complex and has apparently never worked. The fix is to write it the same way as the other callback handlers. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-override-virConnect.py | 2 +- libvirt-override.c | 64 ++++-------------------------------------- 2 files changed, 6 insertions(+), 60 deletions(-) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 23fadfd..0beaf9c 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -38,7 +38,7 @@ """ try: for cb,opaque in self.domainEventCallbacks.items(): - cb(self,dom,event,detail,opaque) + cb(self, virDomain(self, _obj=dom), event, detail, opaque) return 0 except AttributeError: pass diff --git a/libvirt-override.c b/libvirt-override.c index 93b9c5f..5deb414 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4923,7 +4923,6 @@ cleanup: *******************************************/ static PyObject *libvirt_module = NULL; static PyObject *libvirt_dict = NULL; -static PyObject *libvirt_dom_class = NULL; static PyObject * getLibvirtModuleObject(void) { @@ -4959,23 +4958,6 @@ getLibvirtDictObject(void) { return libvirt_dict; } -static PyObject * -getLibvirtDomainClassObject(void) { - if (libvirt_dom_class) - return libvirt_dom_class; - - // PyDict_GetItemString returns a borrowed reference - libvirt_dom_class = PyDict_GetItemString(getLibvirtDictObject(), - "virDomain"); - if (!libvirt_dom_class) { - DEBUG("%s Error importing virDomain class\n", __FUNCTION__); - PyErr_Print(); - return NULL; - } - - Py_INCREF(libvirt_dom_class); - return libvirt_dom_class; -} static PyObject * libvirt_lookupPythonFunc(const char *funcname) @@ -5013,13 +4995,9 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, { PyObject *pyobj_ret; - PyObject *pyobj_conn_inst = (PyObject*)opaque; + PyObject *pyobj_conn = (PyObject*)opaque; PyObject *pyobj_dom; - PyObject *pyobj_dom_args; - PyObject *pyobj_dom_inst; - - PyObject *dom_class; int ret = -1; LIBVIRT_ENSURE_THREAD_STATE; @@ -5027,45 +5005,15 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, /* Create a python instance of this virDomainPtr */ virDomainRef(dom); pyobj_dom = libvirt_virDomainPtrWrap(dom); - pyobj_dom_args = PyTuple_New(2); - if (PyTuple_SetItem(pyobj_dom_args, 0, pyobj_conn_inst) != 0) { - DEBUG("%s error creating tuple", __FUNCTION__); - goto cleanup; - } - if (PyTuple_SetItem(pyobj_dom_args, 1, pyobj_dom) != 0) { - DEBUG("%s error creating tuple", __FUNCTION__); - goto cleanup; - } - Py_INCREF(pyobj_conn_inst); - - dom_class = getLibvirtDomainClassObject(); - if (!PyClass_Check(dom_class)) { - DEBUG("%s dom_class is not a class!\n", __FUNCTION__); - goto cleanup; - } - - pyobj_dom_inst = PyInstance_New(dom_class, - pyobj_dom_args, - NULL); - - Py_DECREF(pyobj_dom_args); - - if (!pyobj_dom_inst) { - DEBUG("%s Error creating a python instance of virDomain\n", - __FUNCTION__); - PyErr_Print(); - goto cleanup; - } /* Call the Callback Dispatcher */ - pyobj_ret = PyObject_CallMethod(pyobj_conn_inst, + pyobj_ret = PyObject_CallMethod(pyobj_conn, (char*)"_dispatchDomainEventCallbacks", (char*)"Oii", - pyobj_dom_inst, - event, - detail); + pyobj_dom, + event, detail); - Py_DECREF(pyobj_dom_inst); + Py_DECREF(pyobj_dom); if (!pyobj_ret) { DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); @@ -5075,8 +5023,6 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, ret = 0; } - -cleanup: LIBVIRT_RELEASE_THREAD_STATE; return ret; } -- 1.8.3.1

2 1

[libvirt] [PATCH] daemon: Run virStateCleanup conditionally
by Michal Privoznik 03 Dec '13

03 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1033061 Currently, initialization of drivers is done in a separate thread. This is done for several reasons: a driver that is initialized may require running event loop, it may take ages to initialize driver (e.g. due to autostarting domains). While the thread is spawn and run, the main() continues its execution. However, if something goes bad, or the event loop is just exited (e.g. due to a --timeout or SIGINT) we try to cleanup all the drivers. So we have two threads running Initialize() and Cleanup() concurrently. This may result in accessing stale pointers - e.g. netcf driver will free() itself in stateCleanup callback, while the init thread may come, open a dummy connection in order to autostart some domains and voilà: do_open() iterates over interface drivers and accesses stale netcf driver. The fix consists in not running stateCleanup if the init thread is still running. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index aef1546..49c42ad 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -108,6 +108,8 @@ virNetServerProgramPtr remoteProgram = NULL; virNetServerProgramPtr qemuProgram = NULL; virNetServerProgramPtr lxcProgram = NULL; +volatile bool driversInitialized = false; + enum { VIR_DAEMON_ERR_NONE = 0, VIR_DAEMON_ERR_PIDFILE, @@ -912,6 +914,8 @@ static void daemonRunStateInit(void *opaque) goto cleanup; } + driversInitialized = true; + #ifdef HAVE_DBUS /* Tie the non-priviledged libvirtd to the session/shutdown lifecycle */ if (!virNetServerIsPrivileged(srv)) { @@ -1546,7 +1550,8 @@ cleanup: daemonConfigFree(config); - virStateCleanup(); + if (driversInitialized) + virStateCleanup(); return ret; } -- 1.8.4.4

3 4

[libvirt] [PATCH] qemu: report error on attempt to live change virtio-net queues
by Laine Stump 03 Dec '13

03 Dec '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1029732 The BZ asked for the capability to change the number of queues used by a virtio-net device while the device is in use. Because the number of queues can only be set at the time the device is created, that isn't possible. However, libvirt also shouldn't be silently reporting success when someone tries to change the number of queues. So this patch flags that as an error (just as attempts to change any of the other virtio-specific parameters already do). --- src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 649c884..c136232 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1899,7 +1899,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, (olddev->driver.virtio.name != newdev->driver.virtio.name || olddev->driver.virtio.txmode != newdev->driver.virtio.txmode || olddev->driver.virtio.ioeventfd != newdev->driver.virtio.ioeventfd || - olddev->driver.virtio.event_idx != newdev->driver.virtio.event_idx)) { + olddev->driver.virtio.event_idx != newdev->driver.virtio.event_idx || + olddev->driver.virtio.queues != newdev->driver.virtio.queues)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver attributes")); goto cleanup; -- 1.8.4.2

2 1

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

03 Dec '13

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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8a1eefd..4bc9d1d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8132,6 +8132,47 @@ cleanup: } static int +qemuSetVcpuCpusetMems(virDomainObjPtr vm, + char *nodeset_str) +{ + size_t j = 0; + qemuDomainObjPrivatePtr priv = vm->privateData; + virCgroupPtr cgroup_vcpu = NULL; + + for (j = 0; j < priv->nvcpupids; j++) { + if (virCgroupNewVcpu(priv->cgroup, j, false, &cgroup_vcpu) < 0) { + return -1; + } + if (virCgroupSetCpusetMems(cgroup_vcpu, nodeset_str) < 0) { + virCgroupFree(&cgroup_vcpu); + return -1; + } + virCgroupFree(&cgroup_vcpu); + } + + return 0; +} + +static int +qemuSetEmulatorCpusetMems(virDomainObjPtr vm, + char *nodeset_str) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virCgroupPtr cgroup_emulator = NULL; + + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_emulator) < 0) { + return -1; + } + if (virCgroupSetCpusetMems(cgroup_emulator, nodeset_str) < 0) { + virCgroupFree(&cgroup_emulator); + return -1; + } + virCgroupFree(&cgroup_emulator); + + return 0; +} + +static int qemuDomainSetNumaParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -8198,7 +8239,11 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } } else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) { virBitmapPtr nodeset = NULL; + virBitmapPtr old_nodeset = NULL; + virBitmapPtr temp_nodeset = NULL; char *nodeset_str = NULL; + char *old_nodeset_str = NULL; + char *temp_nodeset_str = NULL; if (virBitmapParse(params[i].value.s, 0, &nodeset, @@ -8208,32 +8253,92 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + size_t j; + 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; + goto next; } /* 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; + goto next; + } + + /*Get Exisitng nodeset values */ + if (virCgroupGetCpusetMems(priv->cgroup, &old_nodeset_str) < 0) { + ret = -1; + goto next; + } + if (virBitmapParse(old_nodeset_str, 0, &old_nodeset, + VIR_DOMAIN_CPUMASK_LEN) < 0){ + ret = -1; + goto next; + } + + /* Merge the existing and new nodeset values */ + if ((temp_nodeset = virBitmapNewCopy(old_nodeset)) == NULL) { + ret = -1; + goto next; + } + + for (j = 0; j < caps->host.nnumaCell; j++) { + bool result; + if (virBitmapGetBit(nodeset, j, &result) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to get cpuset bit values")); + ret = -1; + goto next; + } + if (result && (virBitmapSetBit(temp_nodeset, j) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set temporary cpuset bit values")); + ret = -1; + goto next; + } + } + + if (!(temp_nodeset_str = virBitmapFormat(temp_nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + ret = -1; + goto next; + } + + if (virCgroupSetCpusetMems(priv->cgroup, temp_nodeset_str) < 0) { + ret = -1; + goto next; + } + + if (qemuSetVcpuCpusetMems(vm, nodeset_str) || + qemuSetEmulatorCpusetMems(vm, nodeset_str)) { + ret = -1; + goto next; } if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) { virBitmapFree(nodeset); VIR_FREE(nodeset_str); ret = -1; - continue; + goto next; } +next : VIR_FREE(nodeset_str); + VIR_FREE(old_nodeset_str); + virBitmapFree(old_nodeset); + VIR_FREE(temp_nodeset_str); + virBitmapFree(temp_nodeset); + if (ret) { + virBitmapFree(nodeset); + continue; + } /* update vm->def here so that dumpxml can read the new * values from vm->def. */

3 2

[libvirt] [PATCH] tests: add forgotten boot-strict test files
by Laine Stump 03 Dec '13

03 Dec '13

These *should* have been pushed in commit 96fddee322c7d39a57cfdc5e7be71326d597d30a. --- Pushed under the build-breaker rule :-( .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 36 ++++++++++++ .../qemuxml2argvdata/qemuxml2argv-boot-strict.xml | 66 ++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args new file mode 100644 index 0000000..19e1217 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -0,0 +1,36 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot strict=on \ +-usb \ +-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=3 \ +-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \ +-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ +bootindex=1 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \ +-global isa-fdc.driveA=drive-fdc0-0-0 \ +-global isa-fdc.bootindexA=4 \ +-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \ +-global isa-fdc.driveB=drive-fdc0-0-1 \ +-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,\ +addr=0x3,bootindex=2 \ +-net user,vlan=0,name=hostnet0 \ +-device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\ +addr=0x4 \ +-net user,vlan=1,name=hostnet1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml new file mode 100644 index 0000000..b20013b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml @@ -0,0 +1,66 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + <boot dev='network'/> + <boot dev='hd'/> + <boot dev='fd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <source file='/tmp/vdb.img'/> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/hdb'/> + <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/hda'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/vda.img'/> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/hdc'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='block' device='floppy'> + <source dev='/dev/fd1'/> + <target dev='fdb' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='block' device='floppy'> + <source dev='/dev/fd0'/> + <target dev='fda' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> + <interface type='user'> + <mac address='00:11:22:33:44:11'/> + <model type='virtio'/> + </interface> + <interface type='user'> + <mac address='00:11:22:33:44:22'/> + <model type='virtio'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> -- 1.8.4.2

1 0

[libvirt] [PATCHv3] qemu: Refactor qemuTranslateDiskSourcePool
by Peter Krempa 03 Dec '13

03 Dec '13

Before this patch, the translation function still needs a second ugly helper function to actually format the command line for qemu. But if we do the right stuff in the translation function, we don't have to bother with the second function any more. This patch removes the messy qemuBuildVolumeString function and changes qemuTranslateDiskSourcePool to set stuff up correctly so that the regular code paths meant for volumes can be used to format the command line correctly. For this purpose a new helper "qemuDiskGetActualType()" is introduced to return the type of the volume in a pool. As a part of the refactor the qemuTranslateDiskSourcePool function is fixed to do decisions based on the pool type instead of the volume type. This allows to separate pool-type-specific stuff more clearly and will ease addition of other pool types that will require certain other operations to get the correct pool source. The previously fixed tests should make sure that we don't break stuff that was working before. --- Notes: Version 3: - fixed commit message typos - the tray status error message now states if it's a disk or a volume - returned startup policy checking Version 2: - Fixed accidental squash into the previous commit src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 81 ++++------------------------ src/qemu/qemu_conf.c | 136 ++++++++++++++++++++++++++++++++++------------- src/qemu/qemu_conf.h | 2 + 5 files changed, 112 insertions(+), 109 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5afbfa7..4934911 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -686,6 +686,7 @@ struct _virDomainDiskSourcePoolDef { char *volume; /* volume name */ int voltype; /* enum virStorageVolType, internal only */ int pooltype; /* enum virStoragePoolType, internal only */ + int actualtype; /* enum virDomainDiskType, internal only */ int mode; /* enum virDomainDiskSourcePoolMode */ }; typedef virDomainDiskSourcePoolDef *virDomainDiskSourcePoolDefPtr; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3a8cbe5..b2c7a8e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -696,6 +696,7 @@ virStoragePoolSourceFree; virStoragePoolSourceListFormat; virStoragePoolSourceListNewSource; virStoragePoolTypeFromString; +virStoragePoolTypeToString; virStorageVolDefFindByKey; virStorageVolDefFindByName; virStorageVolDefFindByPath; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 763417f..d5c9c09 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3775,69 +3775,6 @@ qemuBuildNBDString(virConnectPtr conn, virDomainDiskDefPtr disk, virBufferPtr op return 0; } -static int -qemuBuildVolumeString(virConnectPtr conn, - virDomainDiskDefPtr disk, - virBufferPtr opt) -{ - int ret = -1; - - switch ((virStorageVolType) disk->srcpool->voltype) { - case VIR_STORAGE_VOL_DIR: - if (!disk->readonly) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot create virtual FAT disks in read-write mode")); - goto cleanup; - } - if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) - virBufferEscape(opt, ',', ",", "file=fat:floppy:%s,", disk->src); - else - virBufferEscape(opt, ',', ",", "file=fat:%s,", disk->src); - break; - case VIR_STORAGE_VOL_BLOCK: - if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("tray status 'open' is invalid for " - "block type volume")); - goto cleanup; - } - if (disk->srcpool->pooltype == VIR_STORAGE_POOL_ISCSI) { - if (disk->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT) { - if (qemuBuildISCSIString(conn, disk, opt) < 0) - goto cleanup; - virBufferAddChar(opt, ','); - } else if (disk->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST) { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } - } else { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } - break; - case VIR_STORAGE_VOL_FILE: - if (disk->auth.username) { - if (qemuBuildISCSIString(conn, disk, opt) < 0) - goto cleanup; - virBufferAddChar(opt, ','); - } else { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } - break; - case VIR_STORAGE_VOL_NETWORK: - case VIR_STORAGE_VOL_NETDIR: - case VIR_STORAGE_VOL_LAST: - /* Keep the compiler quiet, qemuTranslateDiskSourcePool already - * reported the unsupported error. - */ - goto cleanup; - } - - ret = 0; - -cleanup: - return ret; -} char * qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -3851,6 +3788,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainDiskGeometryTransTypeToString(disk->geometry.trans); int idx = virDiskNameToIndex(disk->dst); int busid = -1, unitid = -1; + int actualType = qemuDiskGetActualType(disk); if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3934,12 +3872,13 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, /* disk->src is NULL when we use nbd disks */ if ((disk->src || - (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + (actualType == VIR_DOMAIN_DISK_TYPE_NETWORK && disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_NBD)) && !((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { - if (disk->type == VIR_DOMAIN_DISK_TYPE_DIR) { + + if (actualType == VIR_DOMAIN_DISK_TYPE_DIR) { /* QEMU only supports magic FAT format for now */ if (disk->format > 0 && disk->format != VIR_STORAGE_FILE_FAT) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3957,7 +3896,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->src); else virBufferEscape(&opt, ',', ",", "file=fat:%s,", disk->src); - } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) { + } else if (actualType == VIR_DOMAIN_DISK_TYPE_NETWORK) { switch (disk->protocol) { case VIR_DOMAIN_DISK_PROTOCOL_NBD: if (qemuBuildNBDString(conn, disk, &opt) < 0) @@ -4025,15 +3964,13 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferEscape(&opt, ',', ",", "%s,", disk->src); break; } - } else if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { - if (qemuBuildVolumeString(conn, disk, &opt) < 0) - goto error; } else { - if ((disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK) && + if ((actualType == VIR_DOMAIN_DISK_TYPE_BLOCK) && (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("tray status 'open' is invalid for " - "block type disk")); + "block type %s"), + disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME ? _("volume") : _("disk")); goto error; } virBufferEscape(&opt, ',', ",", "file=%s,", disk->src); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 557ccc5..36493ba 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1298,6 +1298,17 @@ cleanup: return ret; } + +int +qemuDiskGetActualType(virDomainDiskDefPtr def) +{ + if (def->type == VIR_DOMAIN_DISK_TYPE_VOLUME) + return def->srcpool->actualtype; + + return def->type; +} + + int qemuTranslateDiskSourcePool(virConnectPtr conn, virDomainDiskDefPtr def) @@ -1319,72 +1330,123 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, if (!(pool = virStoragePoolLookupByName(conn, def->srcpool->pool))) return -1; + if (virStoragePoolIsActive(pool) != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("storage pool '%s' containing volume '%s' " + "is not active"), + def->srcpool->pool, def->srcpool->volume); + goto cleanup; + } + if (!(vol = virStorageVolLookupByName(pool, def->srcpool->volume))) goto cleanup; if (virStorageVolGetInfo(vol, &info) < 0) goto cleanup; - if (def->startupPolicy && - info.type != VIR_STORAGE_VOL_FILE) { + if (!(poolxml = virStoragePoolGetXMLDesc(pool, 0))) + goto cleanup; + + if (!(pooldef = virStoragePoolDefParseString(poolxml))) + goto cleanup; + + def->srcpool->pooltype = pooldef->type; + def->srcpool->voltype = info.type; + + if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("'startupPolicy' is only valid for 'file' type volume")); + _("disk source mode is only valid when " + "storage pool is of iscsi type")); goto cleanup; } - switch ((virStorageVolType) info.type) { - case VIR_STORAGE_VOL_FILE: - case VIR_STORAGE_VOL_DIR: + switch ((enum virStoragePoolType) pooldef->type) { + case VIR_STORAGE_POOL_DIR: + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_NETFS: + case VIR_STORAGE_POOL_LOGICAL: + case VIR_STORAGE_POOL_DISK: + case VIR_STORAGE_POOL_SCSI: if (!(def->src = virStorageVolGetPath(vol))) goto cleanup; - break; - case VIR_STORAGE_VOL_BLOCK: - if (!(poolxml = virStoragePoolGetXMLDesc(pool, 0))) + + if (def->startupPolicy && info.type != VIR_STORAGE_VOL_FILE) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'startupPolicy' is only valid for " + "'file' type volume")); goto cleanup; + } + + + switch (info.type) { + case VIR_STORAGE_VOL_FILE: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_FILE; + break; + + case VIR_STORAGE_VOL_DIR: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_DIR; + break; + + case VIR_STORAGE_VOL_BLOCK: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; + break; - if (!(pooldef = virStoragePoolDefParseString(poolxml))) + case VIR_STORAGE_VOL_NETWORK: + case VIR_STORAGE_VOL_NETDIR: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected storage volume type '%s' " + "for storage pool type '%s'"), + virStorageVolTypeToString(info.type), + virStoragePoolTypeToString(pooldef->type)); goto cleanup; + } + + break; - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + case VIR_STORAGE_POOL_ISCSI: + if (def->startupPolicy) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("disk source mode is only valid when " - "storage pool is of iscsi type")); + _("'startupPolicy' is only valid for " + "'file' type volume")); goto cleanup; } - def->srcpool->pooltype = pooldef->type; - if (pooldef->type == VIR_STORAGE_POOL_ISCSI) { - /* Default to use the LUN's path on host */ - if (!def->srcpool->mode) - def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; - - if (def->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT) { - if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) - goto cleanup; - } else if (def->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST) { - if (!(def->src = virStorageVolGetPath(vol))) - goto cleanup; - } + switch (def->srcpool->mode) { + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT: + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST: + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; + /* fallthrough */ + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; + if (!(def->src = virStorageVolGetPath(vol))) + goto cleanup; + break; + + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) goto cleanup; - } else { - if (!(def->src = virStorageVolGetPath(vol))) + + if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) goto cleanup; + break; } - break; - case VIR_STORAGE_VOL_NETWORK: - case VIR_STORAGE_VOL_NETDIR: - case VIR_STORAGE_VOL_LAST: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Using network volume as disk source is not supported")); + + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: + case VIR_STORAGE_POOL_SHEEPDOG: + case VIR_STORAGE_POOL_GLUSTER: + case VIR_STORAGE_POOL_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("using '%s' pools for backing 'volume' disks " + "isn't yet supported"), + virStoragePoolTypeToString(pooldef->type)); goto cleanup; } - def->srcpool->voltype = info.type; ret = 0; cleanup: if (ret < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d1ae415..0cb7901 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -305,6 +305,8 @@ int qemuSetUnprivSGIO(virDomainDeviceDefPtr dev); int qemuDriverAllocateID(virQEMUDriverPtr driver); virDomainXMLOptionPtr virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver); +int qemuDiskGetActualType(virDomainDiskDefPtr def); + int qemuTranslateDiskSourcePool(virConnectPtr conn, virDomainDiskDefPtr def); -- 1.8.4.3

2 2

[libvirt] [PATCHv2 0/3] Rebase of patch to add support for RBD storage pools
by Adam Walters 03 Dec '13

03 Dec '13

This series of patches adds support for RBD storage pools to the latest version of libvirt. Included in this is a simple structure to build additional network storage pool support off of (really a couple of if/else blocks, so nothing fancy). This code passes check, check-syntax, and the valgrind tests. Additionally, the code is tested working in my environment. In fact, the machine I am sending this email from is a VM being run under qemu+libvirt with backend storage being an RBD storage pool using this code. Unfortunately, I only have the one RBD pool and libvirt host, so the code could use additional testing. If anyone finds any problems with my code, please let me know. I will fix them and resubmit the patch as needed. Hopefully someone else out there finds this support as useful as I do. While not many libvirt management clients utilize the storage API today, it does look to be the better method to interact with storage, and thus likely to be the best way to go in the future. I figure that additional storage backend support may well help to get others using the API instead of duplicating configuration options across every VM. Adam Walters (3): qemu: config: Add qemuAddRBDPoolSourceHost helper function qemu: conf: Parse RBD storage pool from domain xml qemu: command: Handle RBD storage pools src/qemu/qemu_command.c | 11 +++++++++ src/qemu/qemu_conf.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) -- 1.8.4.2

2 4

[libvirt] [PATCH] Doc: Explicitly declaring that nodedev-destroy only works for vHBA
by Osier Yang 03 Dec '13

03 Dec '13

Though trying to destroy a physical HBA doesn't make sense at all, it's still a bit misleading with saying "only works for HBA". Signed-off-by: Osier Yang <jyang(a)redhat.com> --- src/libvirt.c | 5 +++-- tools/virsh.pod | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ae05300..4ebd13f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16065,8 +16065,9 @@ error: * virNodeDeviceDestroy: * @dev: a device object * - * Destroy the device object. The virtual device is removed from the host operating system. - * This function may require privileged access + * Destroy the device object. The virtual device (only works for vHBA + * currently) is removed from the host operating system. This function + * may require privileged access. * * Returns 0 in case of success and -1 in case of failure. */ diff --git a/tools/virsh.pod b/tools/virsh.pod index dac9a08..557df9c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2158,9 +2158,9 @@ contains xml for a top-level <device> description of a node device. =item B<nodedev-destroy> I<device> Destroy (stop) a device on the host. I<device> can be either device -name or wwn pair in "wwnn,wwpn" format (only works for HBA). Note -that this makes libvirt quit managing a host device, and may even make -that device unusable by the rest of the physical host until a reboot. +name or wwn pair in "wwnn,wwpn" format (only works for vHBA currently). +Note that this makes libvirt quit managing a host device, and may even +make that device unusable by the rest of the physical host until a reboot. =item B<nodedev-detach> I<nodedev> [I<--driver backend_driver>] -- 1.8.1.4

2 3

[libvirt] [question] We can create two network of one same linux bridge or local ethernet. It is a bug?
by Sheldon 03 Dec '13

03 Dec '13

> We can create two network of one same linux bridge or local ethernet: This is not harmful. But I wonder should this case is allowed? Why? more detail as follow. > > virsh # net-list --all > Name State Autostart Persistent > ---------------------------------------------------------- > br1 active yes yes > br2 active yes yes > default active yes yes > > virsh # net-dumpxml br1 > <network> > <name>br1</name> > <uuid>d5410814-1bea-b10d-04b8-9fbd3a1cfc65</uuid> > <forward mode='bridge'/> > <bridge name='br0' /> > </network> > > virsh # net-dumpxml br2 > <network> > <name>br2</name> > <uuid>99f20705-57cd-da31-f193-d13af4158792</uuid> > <forward mode='bridge'/> > <bridge name='br0' /> > </network> > > virsh # net-list --all > Name State Autostart Persistent > ---------------------------------------------------------- > br0 active yes yes > br1 active yes yes > default active yes yes > > virsh # net-dumpxml br0 > <network> > <name>br0</name> > <uuid>a35c840a-9bdc-070d-43f5-8e834040aa42</uuid> > <forward dev='eth0' mode='bridge'> > <interface dev='eth0'/> > </forward> > </network> > > virsh # net-dumpxml br1 > <network> > <name>br1</name> > <uuid>f1c87b80-2dfc-2a71-3fb6-56ef83daf29a</uuid> > <forward dev='eth0' mode='bridge'> > <interface dev='eth0'/> > </forward> > </network> -- Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 3

[libvirt] [PATCH] qemu: fix lastError memory leak
by Wangyufei (James) 02 Dec '13

02 Dec '13

When an error occurred in qemuMonitorIO, it will be saved in mon->lastError, but the memory which mon->lastError.message, mon->lastError.str1, mon->lastError.str2 and mon->lastError.str3 will not be freed at last. The same bug happened in qemuAgentIO. So I add the following code to fix it. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_agent.c | 2 ++ src/qemu/qemu_monitor.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 2cd0ccc..475b43e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -161,6 +161,8 @@ static void qemuAgentDispose(void *obj) (mon->cb->destroy)(mon, mon->vm); virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); + if (mon->lastError.code != VIR_ERR_OK) + virResetError(&mon->lastError); } static int diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1514715..df72c5d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -263,6 +263,8 @@ static void qemuMonitorDispose(void *obj) virJSONValueFree(mon->options); VIR_FREE(mon->balloonpath); VIR_FORCE_CLOSE(mon->logfd); + if (mon->lastError.code != VIR_ERR_OK) + virResetError(&mon->lastError); } -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH python] Skip copying manually written python for C APIs which don't exist
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the libvirt-override-virXXXX.py file has methods which call C APIs that don't exist in the version of libvirt built against we need to skip copying their code. eg for 0.9.13 libvirt we should not copy the 'listAllDomains' method. The way this works is that it breaks the override file into individual methods by looking for ' def '. It then collects the contents until the next method start, whereupon it looks for a libvirtmod.XXXXXX API call. It checks if the XXXXX part is present in the XML description we have, and if not, it discards the entire method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/generator.py b/generator.py index e8d8ea9..a9f98ab 100755 --- a/generator.py +++ b/generator.py @@ -1719,11 +1719,51 @@ def buildWrappers(module): classes.write("\n") # Append "<classname>.py" to class def, iff it exists try: + wantfuncs = [] extra = open("libvirt-override-" + classname + ".py", "r") classes.write (" #\n") classes.write (" # %s methods from %s.py (hand coded)\n" % (classname,classname)) classes.write (" #\n") - classes.writelines(extra.readlines()) + cached = None + + + # Since we compile with older libvirt, we don't want to pull + # in manually written python methods which call C methods + # that don't exist. This code attempts to detect which + # methods to skip by looking at the libvirtmod.XXXX calls + + def shouldSkip(lines): + for line in lines: + offset = line.find("libvirtmod.") + if offset != -1: + func = line[offset + 11:] + offset = func.find("(") + func = func[0:offset] + if func not in functions_skipped: + return True + return False + + for line in extra.readlines(): + offset = line.find(" def ") + if offset != -1: + name = line[offset+5:] + offset = name.find("(") + name = name[0:offset] + if cached is not None: + if not shouldSkip(cached): + classes.writelines(cached) + if name == "__del__": + cached = None + classes.write(line) + else: + cached = [line] + else: + if cached is not None: + cached.append(line) + else: + classes.write(line) + if not shouldSkip(cached): + classes.writelines(cached) classes.write("\n") extra.close() except: -- 1.8.3.1

2 1

Re: [libvirt] [libvirt-users] virsh detach typo
by Eric Blake 02 Dec '13

02 Dec '13

On 12/02/2013 02:28 PM, Mauricio Tavares wrote: > [root@vmhost vms]# virsh detach-disk puppet vdb > error: No found disk whose source path or target is vdb > > [root@vmhost vms]# virsh --version > 0.10.2 > [root@vmhost vms]# > > This probably was solved already but if not, "No found disk" probably > sounds better if it was "No disk found" Sure. I'm pushing this under the trivial rule: From aaa7484097333c8194ee6323f5a479e8121cc18c Mon Sep 17 00:00:00 2001 From: Eric Blake <eblake(a)redhat.com> Date: Mon, 2 Dec 2013 14:40:15 -0700 Subject: [PATCH] virsh: improve grammar in error message Based on a suggestion from Mauricio Tavares. * tools/virsh-domain.c (cmdDetachInterface, vshFindDisk): Improve wording. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1fe138c..8b80e1e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9802,7 +9802,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) obj = xmlXPathEval(BAD_CAST buf, ctxt); if (obj == NULL || obj->type != XPATH_NODESET || obj->nodesetval == NULL || obj->nodesetval->nodeNr == 0) { - vshError(ctl, _("No found interface whose type is %s"), type); + vshError(ctl, _("No interface found whose type is %s"), type); goto cleanup; } @@ -9960,7 +9960,7 @@ vshFindDisk(const char *doc, } } - vshError(NULL, _("No found disk whose source path or target is %s"), path); + vshError(NULL, _("No disk found whose source path or target is %s"), path); cleanup: xmlXPathFreeObject(obj); -- 1.8.3.1 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] qemu: add "-boot strict" to commandline whenever possible
by Laine Stump 02 Dec '13

02 Dec '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=888635 (which was already closed as CANTFIX because the qemu "-boot strict" commandline option wasn't available at the time). Problem: you couldn't have a domain that used PXE to boot, but also had an un-bootable disk device *even if that disk wasn't listed in the boot order*, because if PXE timed out (e.g. due to the bridge forwarding delay), the BIOS would move on to the next target, which would be the unbootable disk device (again - even though it wasn't given a boot order), and get stuck at a "BOOT DISK FAILURE, PRESS ANY KEY" message until a user intervened. The solution available since sometime around QEMU 1.5, is to add "-boot strict=on" to *every* qemu command. When this is done, if any devices have a boot order specified, then QEMU will *only* attempt to boot from those devices that have an explicit boot order, ignoring the rest. --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuxml2argvtest.c | 4 ++++ 7 files changed, 17 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 548b988..a68e555 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", + + "boot-strict", /* 160 */ ); struct _virQEMUCaps { @@ -2279,6 +2281,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, + { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 02d47c6..aea64ea 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -198,6 +198,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 763417f..84736d7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8204,6 +8204,12 @@ qemuBuildCommandLine(virConnectPtr conn, def->os.bios.rt_delay); } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_STRICT)) { + if (boot_nparams++) + virBufferAddChar(&boot_buf, ','); + virBufferAddLit(&boot_buf, "strict=on"); + } + if (boot_nparams > 0) { virCommandAddArg(cmd, "-boot"); diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 09cf657..2b00449 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -131,4 +131,5 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 33ee73b..7bce4aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -135,4 +135,5 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index a66034a..bfaab9d 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -134,4 +134,5 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> </qemuCaps> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dad5973..631ece7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -418,6 +418,10 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); + DO_TEST("boot-strict", + QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, + QEMU_CAPS_BOOTINDEX, QEMU_CAPS_BOOT_STRICT, + QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); DO_TEST("bootloader", QEMU_CAPS_DOMID, QEMU_CAPS_KVM); DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT); -- 1.8.4.2

2 1

[libvirt] [PATCH] Fix VMware support for Fusion 6 / Workstation 10
by Brad Ackerman 02 Dec '13

02 Dec '13

This patch gets VMware Fusion 6 working, but the support for ThinPrint needs work—I’m not sure what a good way would be to represent that in libvirt; none of the existing virDomainChrType values seem to be appropriate. Also, what’s the best way to work this into the test suite? Responds to BZ 1036248. — Brad Ackerman N1MNB PGP: 0x9F49A373 brad(a)facefault.org <*> http://bsa.smugmug.com/

3 2

[libvirt] [PATCH] Added python binding for the new network events API
by Cédric Bosdonnat 02 Dec '13

02 Dec '13

This patch was extracted from the network events feature patch to fit the new libvirt-python repository. --- generator.py | 2 + libvirt-override-virConnect.py | 34 +++++++++ libvirt-override.c | 154 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+) diff --git a/generator.py b/generator.py index a9f98ab..02ea821 100755 --- a/generator.py +++ b/generator.py @@ -491,6 +491,8 @@ skip_function = ( 'virConnectDomainEventDeregister', # overridden in virConnect.py 'virConnectDomainEventRegisterAny', # overridden in virConnect.py 'virConnectDomainEventDeregisterAny', # overridden in virConnect.py + 'virConnectNetworkEventRegisterAny', # overridden in virConnect.py + 'virConnectNetworkEventDeregisterAny', # overridden in virConnect.py 'virSaveLastError', # We have our own python error wrapper 'virFreeError', # Only needed if we use virSaveLastError 'virConnectListAllDomains', # overridden in virConnect.py diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 23fadfd..15e9c54 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -198,6 +198,40 @@ except AttributeError: pass + def _dispatchNetworkEventLifecycleCallback(self, net, event, cbData): + """Dispatches events to python user network lifecycle event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virNetwork(self, _obj=net), event, opaque) + return 0 + + def networkEventDeregisterAny(self, callbackID): + """Removes a Network Event Callback. De-registering for a + network callback will disable delivery of this event type """ + try: + ret = libvirtmod.virConnectNetworkEventDeregisterAny(self._o, callbackID) + if ret == -1: raise libvirtError ('virConnectNetworkEventDeregisterAny() failed', conn=self) + del self.networkEventCallbackID[callbackID] + except AttributeError: + pass + + def networkEventRegisterAny(self, net, eventID, cb, opaque): + """Adds a Network Event Callback. Registering for a network + callback will enable delivery of the events """ + if not hasattr(self, 'networkEventCallbackID'): + self.networkEventCallbackID = {} + cbData = { "cb": cb, "conn": self, "opaque": opaque } + if net is None: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, None, eventID, cbData) + else: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, net._o, eventID, cbData) + if ret == -1: + raise libvirtError ('virConnectNetworkEventRegisterAny() failed', conn=self) + self.networkEventCallbackID[ret] = opaque + return ret + def domainEventRegisterAny(self, dom, eventID, cb, opaque): """Adds a Domain Event Callback. Registering for a domain callback will enable delivery of the events """ diff --git a/libvirt-override.c b/libvirt-override.c index 93b9c5f..d613b0d 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6569,6 +6569,156 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, return py_retval; } +#if LIBVIR_CHECK_VERSION(1, 2, 1) +static void +libvirt_virConnectNetworkEventFreeFunc(void *opaque) +{ + PyObject *pyobj_conn = (PyObject*)opaque; + LIBVIRT_ENSURE_THREAD_STATE; + Py_DECREF(pyobj_conn); + LIBVIRT_RELEASE_THREAD_STATE; +} + +static int +libvirt_virConnectNetworkEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virNetworkPtr net, + int event, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_net; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + /* Create a python instance of this virNetworkPtr */ + virNetworkRef(net); + pyobj_net = libvirt_virNetworkPtrWrap(net); + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchNetworkEventLifecycleCallback", + (char*)"OiO", + pyobj_net, + event, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_net); + + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + +static PyObject * +libvirt_virConnectNetworkEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, + PyObject * args) +{ + PyObject *py_retval; /* return value */ + PyObject *pyobj_conn; /* virConnectPtr */ + PyObject *pyobj_net; + PyObject *pyobj_cbData; /* hash of callback data */ + int eventID; + virConnectPtr conn; + int ret = 0; + virConnectNetworkEventGenericCallback cb = NULL; + virNetworkPtr net; + virNetworkEventID eventId = VIR_NETWORK_EVENT_ID_LAST; + + if (!PyArg_ParseTuple + (args, (char *) "OOiO:virConnectNetworkEventRegisterAny", + &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_virConnectNetworkEventRegister(%p %p %d %p) called\n", + pyobj_conn, pyobj_net, eventID, pyobj_cbData); + conn = PyvirConnect_Get(pyobj_conn); + if (pyobj_net == Py_None) + net = NULL; + else + net = PyvirNetwork_Get(pyobj_net); + + if ( ((eventID & 0xFF00) >> 8) != VIR_EVENT_NAMESPACE_NETWORK) { + return VIR_PY_INT_FAIL; + } + + eventId = (virNetworkEventID) (eventID & 0xFF); + switch (eventId) { + case VIR_NETWORK_EVENT_ID_LIFECYCLE: + cb = VIR_NETWORK_EVENT_CALLBACK(libvirt_virConnectNetworkEventLifecycleCallback); + break; + + case VIR_NETWORK_EVENT_ID_LAST: + break; + } + + if (!cb) { + return VIR_PY_INT_FAIL; + } + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectNetworkEventRegisterAny(conn, net, eventID, + cb, pyobj_cbData, + libvirt_virConnectNetworkEventFreeFunc); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) { + Py_DECREF(pyobj_cbData); + } + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + +static PyObject * +libvirt_virConnectNetworkEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, + PyObject * args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + int callbackID; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "Oi:virConnectNetworkEventDeregister", + &pyobj_conn, &callbackID)) + return NULL; + + DEBUG("libvirt_virConnectNetworkEventDeregister(%p) called\n", pyobj_conn); + + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectNetworkEventDeregisterAny(conn, callbackID); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1)*/ + #if LIBVIR_CHECK_VERSION(0, 10, 0) static void libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -7369,6 +7519,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectDomainEventDeregister", libvirt_virConnectDomainEventDeregister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegisterAny", libvirt_virConnectDomainEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(1, 2, 1) + {(char *) "virConnectNetworkEventRegisterAny", libvirt_virConnectNetworkEventRegisterAny, METH_VARARGS, NULL}, + {(char *) "virConnectNetworkEventDeregisterAny", libvirt_virConnectNetworkEventDeregisterAny, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1) */ #if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virConnectRegisterCloseCallback", libvirt_virConnectRegisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virConnectUnregisterCloseCallback", libvirt_virConnectUnregisterCloseCallback, METH_VARARGS, NULL}, -- 1.8.4.2

2 1

[libvirt] [PATCH] Add docs about audit subsystem logging
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Adds a new page to the website "Deployment" section describing what data is sent to the audit logs and how to configure libvirtd audit settings. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/auditlog.html.in | 321 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 4 + 2 files changed, 325 insertions(+) create mode 100644 docs/auditlog.html.in diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in new file mode 100644 index 0000000..c827ab9 --- /dev/null +++ b/docs/auditlog.html.in @@ -0,0 +1,321 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Audit log</h1> + + <ul id="toc"></ul> + + <h2><a name="intro">Introduction</a></h2> + + <p> + A number of the libvirt virtualization drivers (QEMU/KVM and LXC) include + support for logging details of important operations to the host's audit + subsystem. This provides administrators / auditors with a canonical historical + record of changes to virtual machines' / containers' lifecycle states and + their configuration. On hosts which are running the Linux audit daemon, + the logs will usually end up in <code>/var/log/audit/audit.log</code> + </p> + + <h2><a name="config">Configuration</a></h2> + + <p> + The libvirt audit integration is enabled by default on any host which has + the Linux audit subsystem active, and disabled otherwise. It is possible + to alter this behaviour in the <code>/etc/libvirt/libvirtd.conf</code> + configuration file, via the <code>audit_level</code> parameter + </p> + + <ul> + <li><code>audit_level=0</code> - libvirt auditing is disabled regardless + of host audit subsystem enablement.</li> + <li><code>audit_level=1</code> - libvirt auditing is enabled if the host + audit subsystem is enabled, otherwise it is disabled. This is the + default behaviour.</li> + <li><code>audit_level=2</code> - libvirt auditing is enabled regardless + of host audit subsystem enablement. If the host audit subsystem is + disabled, then libvirtd will refuse to complete startup and exit with + an error.</li> + </ul> + + <p> + In addition to have formal messages sent to the audit subsystem it is + possible to tell libvirt to inject messages into its own logging + layer. This will result in messages ending up in the systemd journal + or <code>/var/log/libvirt/libivrtd.log</code> on non-systemd hosts. + This is disabled by default, but can be requested by setting the + <code>audit_logging=1</code> configuration parameter in the same file + mentioned above. + </p> + + <h2><a name="types">Message types</a></h2> + + <p> + Libvirt defines three core audit message types each of which will + be described below. There are a number of common fields that will + be reported for all message types. + </p> + + <dl> + <dt>pid</dt> + <dd>Process ID of the libvirtd daemon generating the audit record.</dd> + <dt>uid</dt> + <dd>User ID of the libvirtd daemon process generating the audit record.</dd> + <dt>subj</dt> + <dd>Security context of the libvirtd daemon process generating the audit record.</dd> + <dt>msg</dt> + <dd>String containing a list of key=value pairs specific to the type of audit record being reported.</dd> + </dl> + + <p> + Some fields in the <code>msg</code> string are common to audit records + </p> + + <dl> + <dt>virt</dt> + <dd>Type of virtualization driver used. One of <code>qemu</code> or <code>lxc</code></dd> + <dt>vm</dt> + <dd>Host driver unique name of the guest</dd> + <dt>uuid</dt> + <dd>Globally unique identifier for the guest</dd> + <dt>exe</dt> + <dd>Path of the libvirtd daemon</dd> + <dt>hostname</dt> + <dd>Currently unused</dd> + <dt>addr</dt> + <dd>Currently unused</dd> + <dt>terminal</dt> + <dd>Currently unused</dd> + <dt>res</dt> + <dd>Result of the action, either <code>success</code> or <code>failed</code></dd> + </dl> + + <h3><a name="typecontrol">VIRT_CONTROL</a></h3> + + <p> + Reports change in the lifecycle state of a virtual machine. The <code>msg</code> + field will include the following sub-fields + </p> + + <dl> + <dt>op</dt> + <dd>Type of operation performed. One of <code>start</code>, <code>stop</code> or <code>init</code></dd> + <dt>reason</dt> + <dd>The reason which caused the operation to happen</dd> + <dt>vm-pid</dt> + <dd>ID of the primary/leading process associated with the guest</dd> + <dt>init-pid</dt> + <dd>ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> + <dt>pid-ns</dt> + <dd>Namespace ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> + </dl> + + <h3><a name="typemachine">VIRT_MACHINE_ID</a></h3> + + <p> + Reports the association of a security context with a guest. The <code>msg</code> + field will include the following sub-fields + </p> + + <dl> + <dt>model</dt> + <dd>The security driver type. One of <code>selinux</code> or <code>apparmor</code></dd> + <dt>vm-ctx</dt> + <dd>Security context for the guest process</dd> + <dt>img-ctx</dt> + <dd>Security context for the guest disk images and other assigned host resources</dd> + </dl> + + <h3><a name="typeresource">VIRT_RESOURCE</a></h3> + + <p> + Reports the usage of a host resource by a guest. The fields include will + vary according to the type of device being reported. When the guest is + initially booted records will be generated for all assigned resources. + If any changes are made to the running guest configuration, for example + hotplug devices, or adjust resources allocation, further records will + be generated. + </p> + + <h4><a name="typeresourcevcpu">Virtual CPU</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>vcpu</code></dd> + <dt>old-vcpu</dt> + <dd>Original vCPU count, or 0</dd> + <dt>new-vcpu</dt> + <dd>Updated vCPU count</dd> + </dl> + + + <h4><a name="typeresourcemem">Memory</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>mem</code></dd> + <dt>old-mem</dt> + <dd>Original memory size in bytes, or 0</dd> + <dt>new-mem</dt> + <dd>Updated memory size in bytes</dd> + </dl> + + <h4><a name="typeresourcedisk">Disk</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>disk</code></dd> + <dt>old-disk</dt> + <dd>Original host file or device path acting as the disk backing file</dd> + <dt>new-disk</dt> + <dd>Updated host file or device path acting as the disk backing file</dd> + </dl> + + <h4><a name="typeresourcenic">Network interface</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>net</code></dd> + <dt>old-net</dt> + <dd>Original MAC address of the guest network interface</dd> + <dt>new-net</dt> + <dd>Updated MAC address of the guest network interface</dd> + </dl> + + <p> + If there is a host network interace associated with the guest NIC then + further records may be generated + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>net</code></dd> + <dt>net</dt> + <dd>MAC address of the host network interface</dd> + <dt>rdev</dt> + <dd>Name of the host network interface</dd> + </dl> + + <h4><a name="typeresourcefs">Filesystem</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>fs</code></dd> + <dt>old-fs</dt> + <dd>Original host directory, file or device path backing the filesystem </dd> + <dt>new-fs</dt> + <dd>Updated host directory, file or device path backing the filesystem</dd> + </dl> + + <h4><a name="typeresourcehost">Host device</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>hostdev</code> or <code>dev</code></dd> + <dt>dev</dt> + <dd>The unique bus identifier of the USB, PCI or SCSI device, if <code>resrc=dev</code></dd> + <dt>disk</dt> + <dd>The path of the block device assigned to the guest, if <code>resrc=hostdev</code></dd> + <dt>chardev</dt> + <dd>The path of the charecter device assigned to the guest, if <code>resrc=hostdev</code></dd> + </dl> + + <h4><a name="typeresourcetpm">TPM</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>tpm</code></dd> + <dt>device</dt> + <dd>The path of the host TPM device assigned to the guest</dd> + </dl> + + <h4><a name="typeresourcerng">RNG</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>rng</code></dd> + <dt>old-rng</dt> + <dd>Original path of the host entropy source for the RNG</dd> + <dt>new-rng</dt> + <dd>Updated path of the host entropy source for the RNG</dd> + </dl> + + + <h4><a name="typeresourceredir">Redirected device</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>redir</code></dd> + <dt>bus</dt> + <dd>The bus type, only <code>usb</code> allowed</dd> + <dt>device</dt> + <dd>The device type, only <code>USB redir</code> allowed</dd> + </dl> + + <h4><a name="typeresourcecgroup">Control group</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>cgroup</code></dd> + <dt>cgroup</dt> + <dd>The name of the cgroup controller</dd> + </dl> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index d821a9e..60daf15 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -91,6 +91,10 @@ <span>The library and the daemon logging support</span> </li> <li> + <a href="auditlog.html">Audit log</a> + <span>Audit trail logs for host operations</span> + </li> + <li> <a href="firewall.html">Firewall</a> <span>Firewall and network filter configuration</span> </li> -- 1.8.3.1

3 3

[libvirt] GlusterFS with libvirt
by Umar Draz 02 Dec '13

02 Dec '13

Hi All, Is any body help me how I can integrate libvirt with glusterfs on Ubuntu 13.10 Server. I tried the following, but its not working. qemu-img: Unknown protocol 'gluster://localhost/gv1/test.img' Br. Umar

6 7

[libvirt] [PATCH] docs: fix typo in previous patch
by Eric Blake 02 Dec '13

02 Dec '13

Avoid a nested comment compilation error. * include/libvirt/libvirt.h.in: Fix typo. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial/build-breaker, and sorry for the one-byte mistake. include/libvirt/libvirt.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 496986e..29d4dce 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3587,7 +3587,7 @@ typedef enum { /** * virDomainEventCrashedDetailType: -/* + * * Details on the cause of a 'crashed' lifecycle event */ typedef enum { -- 1.8.3.1

1 0

[libvirt] Internal error message from netcf when trying to start libvirtd
by Christophe Fergeau 02 Dec '13

02 Dec '13

Hey, Due to a configuration issue on my system, libvirtd is not starting on my system (not complaining about this!): 2013-10-15 15:40:51.024+0000: 10222: info : libvirt version: 1.1.3 2013-10-15 15:40:51.024+0000: 10222: error : virNetTLSContextCheckCertFile:117 : Cannot read CA certificate '/home/teuf/usr/etc/pki/CA/cacert.pem': No such file or directory However, before libvirtd exits, I get another error message from the netcf code, which is unexpected this time: 2013-10-15 15:49:18.361+0000: 10222: error : netcfStateCleanup:105 : internal error: Attempt to close netcf state driver already closed This message comes from the call of virStateCleanup() at the end of main() in libvirtd.c. virStateCleanup() should not be called before daemonStateInit() has been called in main. After this call, things get more ugly as daemonStateInit() calls virStateInitialize() from a thread, so there's probably a small window for virStateInitialize() and virStateCleanup() running concurrently if an error occurs between the call to daemonStateInit() and the call to virNetServerRun(). I'm sending this email rather than a patch as I'm not sure what is the best way to fix it. The easy way would be for virStateCleanup() to be a noop when virStateInitialize() hasn't been called (iow remove the error message from netcfStateCleanup). However, this would leave this small race condition around (which is not that bad as it would only occurs in situations when the daemon fails to start). So another approach would be to set a vir_state_initialized boolean once the thread has called ivrStateInitialize, and only call virStateCleanup() when it's set. Or maybe there's a 3rd way to fix this? Let me know if you have any guidance into the best way to fix this, Christophe

3 7

[libvirt] [PATCH] Ensure to zero out the virDomainBlockJobInfo arg
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainGetBlockJobInfo method did not zero out the virDomainBlockJobInfo pointer arg, so when block jobs were not active it would return garbage for the bandwidth/cur/end fields. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index eff44eb..a2df53d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -20850,6 +20850,8 @@ int virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(disk, error); virCheckNonNullArgGoto(info, error); + memset(info, 0, sizeof(*info)); + if (conn->driver->domainGetBlockJobInfo) { int ret; ret = conn->driver->domainGetBlockJobInfo(dom, disk, info, flags); -- 1.8.3.1

2 1

[libvirt] [PATCH v2] docs: fix typos in libvirt.h.in
by Chen Hanxiao 02 Dec '13

02 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/caused/causes Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: modified according to Nehal's comment include/libvirt/libvirt.h.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 146a59b..5bc5a31 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3461,7 +3461,7 @@ typedef enum { /** * virDomainEventDefinedDetailType: * - * Details on the caused of the 'defined' lifecycle event + * Details on the causes of the 'defined' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_DEFINED_ADDED = 0, /* Newly created config file */ @@ -3475,7 +3475,7 @@ typedef enum { /** * virDomainEventUndefinedDetailType: * - * Details on the caused of the 'undefined' lifecycle event + * Details on the causes of the 'undefined' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_UNDEFINED_REMOVED = 0, /* Deleted the config file */ @@ -3488,7 +3488,7 @@ typedef enum { /** * virDomainEventStartedDetailType: * - * Details on the caused of the 'started' lifecycle event + * Details on the causes of the 'started' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_STARTED_BOOTED = 0, /* Normal startup from boot */ @@ -3505,7 +3505,7 @@ typedef enum { /** * virDomainEventSuspendedDetailType: * - * Details on the caused of the 'suspended' lifecycle event + * Details on the causes of the 'suspended' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_SUSPENDED_PAUSED = 0, /* Normal suspend due to admin pause */ @@ -3524,7 +3524,7 @@ typedef enum { /** * virDomainEventResumedDetailType: * - * Details on the caused of the 'resumed' lifecycle event + * Details on the causes of the 'resumed' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_RESUMED_UNPAUSED = 0, /* Normal resume due to admin unpause */ @@ -3539,7 +3539,7 @@ typedef enum { /** * virDomainEventStoppedDetailType: * - * Details on the caused of the 'stopped' lifecycle event + * Details on the causes of the 'stopped' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN = 0, /* Normal shutdown */ -- 1.8.2.1

3 2

[libvirt] [PATCH] docs: fix typos in libvirt.h.in
by Chen Hanxiao 02 Dec '13

02 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/caused/cause Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 146a59b..934d425 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3461,7 +3461,7 @@ typedef enum { /** * virDomainEventDefinedDetailType: * - * Details on the caused of the 'defined' lifecycle event + * Details on the cause of the 'defined' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_DEFINED_ADDED = 0, /* Newly created config file */ @@ -3475,7 +3475,7 @@ typedef enum { /** * virDomainEventUndefinedDetailType: * - * Details on the caused of the 'undefined' lifecycle event + * Details on the cause of the 'undefined' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_UNDEFINED_REMOVED = 0, /* Deleted the config file */ @@ -3488,7 +3488,7 @@ typedef enum { /** * virDomainEventStartedDetailType: * - * Details on the caused of the 'started' lifecycle event + * Details on the cause of the 'started' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_STARTED_BOOTED = 0, /* Normal startup from boot */ @@ -3505,7 +3505,7 @@ typedef enum { /** * virDomainEventSuspendedDetailType: * - * Details on the caused of the 'suspended' lifecycle event + * Details on the cause of the 'suspended' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_SUSPENDED_PAUSED = 0, /* Normal suspend due to admin pause */ @@ -3524,7 +3524,7 @@ typedef enum { /** * virDomainEventResumedDetailType: * - * Details on the caused of the 'resumed' lifecycle event + * Details on the cause of the 'resumed' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_RESUMED_UNPAUSED = 0, /* Normal resume due to admin unpause */ @@ -3539,7 +3539,7 @@ typedef enum { /** * virDomainEventStoppedDetailType: * - * Details on the caused of the 'stopped' lifecycle event + * Details on the cause of the 'stopped' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN = 0, /* Normal shutdown */ -- 1.8.2.1

3 3

[libvirt] RFC: virsh: add support for redirecting output to files in virsh shell
by Nehal J Wani 02 Dec '13

02 Dec '13

Currently, for redirecting output (most of the times its the output of --dumpxml) we use: virsh $command > $file But such redirection is not possible in virsh shell. It would be great if libvirt supported this feature for those who love working in the 'virsh shell' (instead of typing 'virsh' before every command). A simple approach would be to either add the redirection feature using '>' or having some option like -o or --outfile (it would be nice if it is available for each command, and not just restricted to --dumpxml ones) Regards, Nehal J Wani

2 1

[libvirt] [PATCH] qemu: default to vfio for nodedev-detach
by Laine Stump 02 Dec '13

02 Dec '13

This patch resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1035188 Commit f094aaac48a6 changed the PCI device assignment in qemu domains to default to using VFIO rather than legacy KVM device assignment (when VFIO is available). It didn't change which driver was used by default for virNodeDeviceDetachFlags(), though, so that API (and the virsh nodedev-detach command) was still binding to the pci-stub driver, used by legacy KVM assignment, by default. This patch publicizes (only within the qemu module, though, so no additions to the symbol exports are needed) the functions that check for presence of KVM and VFIO device assignment, then uses those functions to decide what to do when no driver is specified for virNodeDeviceDetachFlags(); if the vfio driver is loaded, the device will be bound to vfio-pci, or if legacy KVM assignment is supported on this system, the device will be bound to pci-stub; if neither method is avialable, the detach will fail. --- src/qemu/qemu_driver.c | 19 ++++++++++++++++--- src/qemu/qemu_hostdev.c | 6 +++--- src/qemu/qemu_hostdev.h | 4 +++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 47d8a09..6e65d7c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10737,12 +10737,25 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, if (!pci) goto cleanup; - if (!driverName || STREQ(driverName, "kvm")) { - if (virPCIDeviceSetStubDriver(pci, "pci-stub") < 0) - goto cleanup; + if (!driverName) { + /* prefer vfio */ + if (qemuHostdevHostSupportsPassthroughVFIO()) + driverName = "vfio"; + else if (qemuHostdevHostSupportsPassthroughLegacy()) + driverName = "kvm"; + } + + if (!driverName) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("neither VFIO nor kvm device assignment is " + "currently supported on this system")); + goto cleanup; } else if (STREQ(driverName, "vfio")) { if (virPCIDeviceSetStubDriver(pci, "vfio-pci") < 0) goto cleanup; + } else if (STREQ(driverName, "kvm")) { + if (virPCIDeviceSetStubDriver(pci, "pci-stub") < 0) + goto cleanup; } else { virReportError(VIR_ERR_INVALID_ARG, _("unknown driver name '%s'"), driverName); diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index f5cad15..dee61e7 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -501,7 +501,7 @@ qemuDomainHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev, } -static bool +bool qemuHostdevHostSupportsPassthroughVFIO(void) { DIR *iommuDir = NULL; @@ -541,7 +541,7 @@ cleanup: #if HAVE_LINUX_KVM_H # include <linux/kvm.h> -static bool +bool qemuHostdevHostSupportsPassthroughLegacy(void) { int kvmfd = -1; @@ -563,7 +563,7 @@ cleanup: return ret; } #else -static bool +bool qemuHostdevHostSupportsPassthroughLegacy(void) { return false; diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 272086e..ffb3167 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -1,7 +1,7 @@ /* * qemu_hostdev.h: QEMU hostdev management * - * Copyright (C) 2006-2007, 2009-2010 Red Hat, Inc. + * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -33,6 +33,8 @@ int qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver, virDomainDefPtr def); int qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver, virDomainDefPtr def); +bool qemuHostdevHostSupportsPassthroughLegacy(void); +bool qemuHostdevHostSupportsPassthroughVFIO(void); int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, const char *name, const unsigned char *uuid, -- 1.8.4.2

2 1

[libvirt] clone "img" on iscsi storage
by Jason 02 Dec '13

02 Dec '13

Hi: I need to clone a vm, the source is "vm1.img",i need to clone the "vm1.img" to a iscsi storage volume, it's said that i can't create volume on a iscsi. I use virStorageVolCreateXMLFrom to do this, can you do me a favor? thank you. the virt-manager can clone the "vm1.img" to overwrite the iscsi "lun",what can i do to do the same thing, i do not understand the python.

1 0

[libvirt] [PATCH 1/3] vbox: fix incorrect loop condition in vboxHostDeviceGetXMLDesc
by Ryota Ozaki 02 Dec '13

02 Dec '13

The fixed loop used logical OR to combine two conditions, however, it is apparently incorrect and logical AND is correct. We can fix it by replacing OR with AND, but this patch instead fixes the problem by getting rid of the first conditional statement: USBFilterCount < def->nhostdevs. It isn't needed because USBFilterCount will never be greater than or equal to def->nhostdevs. def->nhostdevs is calculated in the following code above the loop in question like this: for (i = 0; i < deviceFilters.count; i++) { PRBool active = PR_FALSE; IUSBDeviceFilter *deviceFilter = deviceFilters.items[i]; deviceFilter->vtbl->GetActive(deviceFilter, &active); if (active) { def->nhostdevs++; } } And the loop is constructed as like this: for (i = 0; (USBFilterCount < def->nhostdevs) || (i < deviceFilters.count); i++) { PRBool active = PR_FALSE; (snip) deviceFilter->vtbl->GetActive(deviceFilter, &active); if (!active) continue; (snip) USBFilterCount++; } So def->nhostdevs is the number of active device filters and USBFilterCount is counted up only when a device filter is active. Thus, we can remove USBFilterCount < def->nhostdevs safely. Reported-by: Laine Stump <laine(a)laine.org> Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/vbox/vbox_tmpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 983a595..cc5f275 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2269,7 +2269,7 @@ static void vboxHostDeviceGetXMLDesc(vboxGlobalData *data, virDomainDefPtr def, if (VIR_ALLOC_N(def->hostdevs, def->nhostdevs) < 0) goto release_filters; - for (i = 0; (USBFilterCount < def->nhostdevs) || (i < deviceFilters.count); i++) { + for (i = 0; i < deviceFilters.count; i++) { PRBool active = PR_FALSE; IUSBDeviceFilter *deviceFilter = deviceFilters.items[i]; PRUnichar *vendorIdUtf16 = NULL; -- 1.8.4

2 6

[libvirt] [PATCH] tests: Fix comment for fake storage pool driver
by Peter Krempa 02 Dec '13

02 Dec '13

Commit bae124e40ff2b9d4de75d44510619db2c08d548a was accidentaly pushed without review feedback worked in. Fix it up. --- tests/qemuxml2argvtest.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 17d4554..e9a32fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -227,17 +227,16 @@ fakeStoragePoolIsActive(virStoragePoolPtr pool) /* Test storage pool implementation * * These functions aid testing of storage pool related stuff when creating a - * qemu command . + * qemu command line. * * There are a few "magic" values to pass to these functions: * - * 1) "inactive" as - * a pool name for pool lookup creates a inactive pool. All other names are - * interpreted as file names for files of storagepooltest and are used as the + * 1) "inactive" as a pool name to create an inactive pool. All other names are + * interpreted as file names in storagepoolxml2xmlout/ and are used as the * definition for the pool. If the file doesn't exist the pool doesn't exist. * * 2) "nonexistent" returns an error while looking up a volume. Otherwise - * pattern VOLUME_TYPE+VOLUME_PATH can be used to simulate a volume in an pool. + * pattern VOLUME_TYPE+VOLUME_PATH can be used to simulate a volume in a pool. * This creates a fake path for this volume. If the '+' sign is omitted, block * type is assumed. */ -- 1.8.4.3

1 1

[libvirt] [PATCHv2 0/4] Refactor pool source formatting
by Peter Krempa 02 Dec '13

02 Dec '13

A subset of the big gluster snapshot series. I accidentaly squashed two patches together so I'm reposting the subset that was broken for re-review. Peter Krempa (4): 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: Refactor qemuTranslatePool source src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 76 +-------- src/qemu/qemu_conf.c | 129 +++++++++----- src/qemu/qemu_conf.h | 2 + .../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 | 187 +++++++++++++++++++++ 10 files changed, 306 insertions(+), 114 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

2 11

[libvirt] [PATCH] Fix pid ouput of libvirt.rpc.socket_new probe
by Jincheng Miao 02 Dec '13

02 Dec '13

Pass the pid value when invoking virNetSocketNew(). This will make libvirt.rpc.socket_new stap probe return the right pid. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/rpc/virnetsocket.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 04bf25a..4c98fa9 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -300,7 +300,8 @@ int virNetSocketNewListenTCP(const char *nodename, if (VIR_EXPAND_N(socks, nsocks, 1) < 0) goto error; - if (!(socks[nsocks-1] = virNetSocketNew(&addr, NULL, false, fd, -1, 0))) + if (!(socks[nsocks-1] = virNetSocketNew(&addr, NULL, false, fd, -1, + getpid()))) goto error; runp = runp->ai_next; fd = -1; @@ -382,7 +383,7 @@ int virNetSocketNewListenUNIX(const char *path, goto error; } - if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0))) + if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, getpid()))) goto error; return 0; @@ -420,7 +421,7 @@ int virNetSocketNewListenFD(int fd, return -1; } - if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0))) + if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, getpid()))) return -1; return 0; @@ -497,7 +498,8 @@ int virNetSocketNewConnectTCP(const char *nodename, goto error; } - if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0))) + if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, + getpid()))) goto error; freeaddrinfo(ai); @@ -574,7 +576,8 @@ retry: goto error; } - if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0))) + if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, + getpid()))) goto error; return 0; @@ -1741,7 +1744,8 @@ int virNetSocketAccept(virNetSocketPtr sock, virNetSocketPtr *clientsock) if (!(*clientsock = virNetSocketNew(&localAddr, &remoteAddr, true, - fd, -1, 0))) + fd, -1, + getpid()))) goto cleanup; fd = -1; -- 1.8.3.1

2 1

[libvirt] Release of libvirt-1.2.0
by Daniel Veillard 02 Dec '13

02 Dec '13

Technically this is also the first release of libvirt-python as this is the major change leading to the bump in middle version number. The libvirt tarballs and rpms are available at the usual place: ftp://libvirt.org/libvirt/ while libvirt-python-1.2.0 tarball and rpms are in the new location: ftp://libvirt.org/libvirts of course both git trees are now tagged and development can resume. The other 2 major user visible features are support for gluster pools at the storage level and support for VBox 4.3 . This is otherwise a relatively small release with less than 200 commits with a balanced ratio of bug fixes and improvements: Features: - Add support for gluster pool (Eric Blake) - Remove python binding (Daniel P. Berrange) - vbox: add support for 4.3 APIs (Ryota Ozaki) Documentation: - fix typos in libvirt.h.in (Chen Hanxiao) - Link libvirt-sandbox from apps page (Daniel P. Berrange) - Add docs about audit subsystem logging (Daniel P. Berrange) - virsh: fix doc typos (Nehal J Wani) - Fix typos in various docs (Nehal J Wani) - LXC: add securetty related note in Device nodes (Gao feng) - Fix three minor typos (Yuri Chornoivan) - storage: fix typo in previous patch (Eric Blake) - storage: document gluster pool (Eric Blake) - virDomainReboot: Document that migration might be unsafe (Michal Privoznik) - delete extra character (Wangyufei (A)) - maint: fix comment typos. (Eric Blake) - improve job info details (Eric Blake) - fix a typo in formatnwfilter.html.in (Chen Hanxiao) - Improve cgroups docs to cover systemd integration (Daniel P. Berrange) - fix typos in libvirt.h.in (Chen Hanxiao) - fix virDomainRestoreFlags description bug (Wang Yufei) - grammar fixes (Eric Blake) - add SystemTap to apps using libvirt (Jonathan Lebon) - fix a typo in formatnwfilter (Chen Hanxiao) - caps: Fix function docs for virCapabilitiesAddHostNUMACell (Peter Krempa) Portability: - tests: fix virpcitest with read-only srcdir (Eric Blake) - tests: guarantee abs_srcdir in all C tests (Eric Blake) - look for numad in /usr/sbin (Jim Fehlig) - build: Don't fail on '<' or '>' with old xmllint (Martin Kletzander) - spec: fix libvirt-docs subpackage on RHEL-6 (Michael Chapman) - Don't depend on syslog.service (Guido Günther) - qemuMonitorJSONGetCPUx86Data: Don't fail on ancient qemus (Michal Privoznik) - build: work around super-old readline.h (Ryota Ozaki) - Fix migration with QEMU 1.6 (Michael Avdienko) - nodeinfo: fix build on non-Linux (Eric Blake) Bug Fixes: - vbox: handle errors of virDomainHostdevDefAlloc correctly (Ryota Ozaki) - vbox: fix incorrect loop condition in vboxHostDeviceGetXMLDesc (Ryota Ozaki) - Fix memory leak in virNWFilterDefParseXML() (Nehal J Wani) - Fix memory leak in virDomainDefParseXML() (Nehal J Wani) - LXC: Ensure security context is set when mounting images (Daniel P. Berrange) - network: properly update iptables rules during net-update (Laine Stump) - Fix bug in identifying sub-mounts (Daniel P. Berrange) - storage: skip selinux cleanup when fd not available (Eric Blake) - qemu: preserve netdev MAC address during 'domxml-to-native' (Bing Bu Cao) - storage: don't read storage volumes in nonblock mode (Eric Blake) - LXC: don't unmount mounts for shared root (Gao feng) - LXC: fix the problem that libvirt lxc fail to start on latest kernel (Gao feng) - sasl: Fix authentication when using PLAIN mechanism (Christophe Fergeau) - Fix invalid read in virNetSASLSessionClientStep debug log (Christophe Fergeau) - Tie SASL callbacks lifecycle to virNetSessionSASLContext (Christophe Fergeau) - remote: Don't leak priv->tls object on connection failure (Christophe Fergeau) - spec: Don't save/restore running VMs on libvirt-client update (Jiri Denemark) - virsh domxml-from-native to treat SCSI as the bus type for pseries by default (Shivaprasad G Bhat) - Don't start a nested job in qemuMigrationPrepareAny (Ján Tomko) - spec: Don't save/restore running VMs on libvirt-client update (Cole Robinson) - spec: Restrict virt-login-shell usage (Jiri Denemark) - storage: use valid XML for awkward volume names (Eric Blake) - storage: Returns earlier if source adapter of the scsi pool is a HBA (Osier Yang) - libvirt-guests: Run only after libvirtd (Cole Robinson) - Fix off-by-1 in default SELinux MCS range (Daniel P. Berrange) - vbox: fix segfault on virsh dumpxml with the existence of USB filters (Ryota Ozaki) - Add missing 'return 0;' in stub lxcStartFuse() method impl. (Daniel P. Berrange) - Avoid async signal safety problem in glibc's setxid (Daniel P. Berrange) - Don't release spice port twice when no TLS port is available (Ján Tomko) - Properly unref a connection with a close callback (Ján Tomko) - qemu: Call qemuSetupHostdevCGroup later during hotplug (Jiri Denemark) - qemuMonitorIO: Don't use @mon after it's unrefed (Michal Privoznik) - qemuProcessReconnectHelper: Don't create joinable thread (Michal Privoznik) - virDomainEventCallbackListFree: Don't leak @list->callbacks (Michal Privoznik) - networkBuildDhcpDaemonCommandLine: Don't leak @configstr and @configfile (Michal Privoznik) - Disable nwfilter driver when running unprivileged (Ján Tomko) - libxl: Fix Xen 4.4 libxlVmStart logic (Jason Andryuk) - qemu: Check for presence of device and properities when getting CPUID (Peter Krempa) - Fix busy wait loop in LXC container I/O handling (Daniel P. Berrange) - Don't expose 'none' machine type to capabilities (Daniel P. Berrange) - Fix mem leak in virQEMUCapsProbeQMPMachineTypes on OOM (Daniel P. Berrange) - virSecurityLabelDefParseXML: Don't parse label on model='none' (Michal Privoznik) - virsh-domain: Mark --live and --config mutually exclusive in vcpucount (Peter Krempa) - qemu: Fix SCSI hotplug on pseries guests (Vitor de Lima) - pci: properly handle out-of-order SRIOV virtual functions (Laine Stump) - util: use -w flag when calling iptables (Serge Hallyn) - storage: Fix a vol-clone bug on ppc64 (Li Zhang) - qemu: Don't access vm->priv on unlocked domain (Michal Privoznik) - qemu: Avoid double free of VM (Michal Privoznik) - Allow root directory in filesystem source dir schema (Ján Tomko) - qemuMigrationBeginPhase: Check for 'drive-mirror' for NBD (Michal Privoznik) - conf: fix incorrect error log in virCPUDefIsEqual (Chen Hanxiao) - qemuMonitorDispose: Reset lastError (Michal Privoznik) - qemu: clean up migration ports when migration cancelled (Zeng Junliang) - network: fix connections count in case of allocate failure (Laine Stump) - virpcitest: Fix variable arguments using in pci_driver_new (Michal Privoznik) - virpci: Don't error on unbinded devices (Michal Privoznik) Improvements: - Pull lxcContainerGetSubtree out into shared virfile module (Daniel P. Berrange) - Introduce standard methods for sorting strings with qsort (Daniel P. Berrange) - conf: Export virStorageVolType enum helper functions (Peter Krempa) - sasl: Replace 'restep' label with 'continue' (Christophe Fergeau) - storage: probe qcow2 volumes in gluster pool (Eric Blake) - storage: improve handling of symlinks in gluster (Eric Blake) - storage: improve allocation stats reported on gluster files (Eric Blake) - storage: improve directory support in gluster pool (Eric Blake) - storage: add network-dir as new storage volume type (Eric Blake) - storage: implement rudimentary glusterfs pool refresh (Eric Blake) - storage: initial support for linking with libgfapi (Eric Blake) - storage: expose volume meta-type in XML (Eric Blake) - storage: allow interleave in volume XML (Eric Blake) - maint: next release is 1.2.0 (Eric Blake) - vbox: import vbox_CAPI_v4_3.h from SDK (Ryota Ozaki) - vbox: pull vboxHostDeviceGetXMLDesc out from vboxDomainGetXMLDesc (Ryota Ozaki) - vbox: cleanup vboxAttachUSB (Ryota Ozaki) - lxc: don't do duplicate work when getting pagesize (Chen Hanxiao) - maint: update to latest gnulib (Eric Blake) - python: remove virConnectGetCPUModelNames from globals (Doug Goldstein) - python: remove virConnectGetCPUModelNames from globals (Doug Goldstein) - qemu: Auto-generate controller for hotplugged hostdev (Eric Farman) - qemu: Separate calls based on controller bus type (Eric Farman) - qemu: Rename controller hotplug functions to not be PCI-specific (Eric Farman) - qemu: Add support for virt machine type with virtio-mmio devices on armv7 (Clark Laughlin) - maint: enforce comma style usage (Eric Blake) - maint: fix comma style issues: remaining code (Eric Blake) - maint: fix comma style issues: remaining drivers (Eric Blake) - maint: fix comma style issues: vbox (Eric Blake) - maint: fix comma style issues: python (Eric Blake) - maint: fix comma style issues: util (Eric Blake) - maint: fix comma style issues: tests, tools (Eric Blake) - maint: fix comma style issues: qemu (Eric Blake) - maint: fix comma style issues: xen (Eric Blake) - maint: fix comma style issues: conf (Eric Blake) - maint: fix comma style issues: nwfilter (Eric Blake) - Error out on unterminated arrays and objects in JSON parser (Ján Tomko) - Test if JSON parser fails on invalid input (Ján Tomko) - maint: ship .pl scripts as executables (Eric Blake) - Fix virsh net-info output for consistency (Hao Liu) - Add missing break to switch-case block (Doug Goldstein) - qemumonitorjsontest: Introduce GetNonExistingCPUData test (Michal Privoznik) - Macro for testing the version you are compiling with (Doug Goldstein) - Return -1 in virPortAllocatorAcquire if all ports are used (Ján Tomko) - Add a name to virPortAllocator (Ján Tomko) - storage: fix RNG validation of gluster via netfs (Eric Blake) - virsh-secret: Unify list column alignment (Peter Krempa) - virsh-interface: Unify list column alignment (Peter Krempa) - virsh-nwfilter: Unify list command column alignment (Peter Krempa) - virsh-pool: Unify spacing of listing function (Peter Krempa) - qemu: Change return type of qemuMonitorGetGuestCPU() (Peter Krempa) - virsh-volume: Unify strigification of volume type (Peter Krempa) - virsh-volume: Unify alignment of vol-list output columns (Peter Krempa) - conf: Refactor virDomainDiskSourceDefParse (Peter Krempa) - conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear (Peter Krempa) - conf: Split out code to parse the source of a disk definition (Peter Krempa) - qemuDomainObjStart: Warn on corrupted image (Michal Privoznik) - util: use size_t instead of unsigned int for num_virtual_functions (Laine Stump) - qemu: assign PCI address to primary video card (Vitor de Lima) - qemu: process: Validate specific CPUID flags of a guest (Peter Krempa) - qemu: Add support for paravirtual spinlocks in the guest (Peter Krempa) - conf: Refactor storing and usage of feature flags (Peter Krempa) - cpu: x86: Add internal CPUID features support and KVM feature bits (Peter Krempa) - qemu: Add monitor APIs to fetch CPUID data from QEMU (Jiri Denemark) - cpu_x86: Refactor storage of CPUID data to add support for KVM features (Peter Krempa) - tests: Distribute virpcitestdata (Michal Privoznik) - tests: Fix virtpcitest in VPATH (Jiri Denemark) - conf: Refactor virDomainDiskSourcePoolDefParse (Peter Krempa) - storage: always probe type with buffer (Eric Blake) - storage: refactor backing chain division of labor (Eric Blake) - storage: reduce number of stat calls (Eric Blake) - storage: avoid short reads while chasing backing chain (Eric Blake) - storage: use simpler 'char *' (Eric Blake) - test driver: add support for .connectBaselineCPU (Giuseppe Scrivano) - virpcitest: Introduce testVirPCIDeviceReset (Michal Privoznik) - virt-login-shell: also build virAtomic.h (Guido Günther) - storage: recognize gluster as networked file (Eric Blake) - qemu: don't use deprecated -no-kvm-pit-reinjection (Ján Tomko) - Resolve Coverity issue regarding not checking return value (John Ferlan) - Skip any files which are not mounted on the host (Daniel P. Berrange) - Add flag to lxcBasicMounts to control use in user namespaces (Daniel P. Berrange) - Remove duplicate entries in lxcBasicMounts array (Daniel P. Berrange) - Remove pointless 'srcpath' variable in lxcContainerMountBasicFS (Daniel P. Berrange) - Remove unused 'opts' field from LXC basic mounts struct (Daniel P. Berrange) - Add virFileIsMountPoint function (Daniel P. Berrange) - virpcitest: Introduce check for unbinded devices (Michal Privoznik) - virpcitest: Introduce testVirPCIDeviceReattach (Michal Privoznik) - virpcitest: Test virPCIDeviceDetach (Michal Privoznik) - tests: Introduce virpcitest (Michal Privoznik) - cpu: x86: Parse the CPU feature map only once (Peter Krempa) - cpu: Export few x86-specific APIs (Jiri Denemark) - nodeinfo: Remove libnuma include (Peter Krempa) - numa: Add wrapper of numa_node_to_cpus and use it (Peter Krempa) - numa: Replace NUMA_MAX_N_CPUS macro with virNumaGetMaxCPUs() (Peter Krempa) - nodeinfo: Get rid of nodeGetCellMemory (Peter Krempa) - numa: Introduce virNumaGetNodeMemory and use it instead of numa_node_size64 (Peter Krempa) - numa: Introduce virNumaGetMaxNode and use it instead of numa_max_node (Peter Krempa) - nodeinfo: Avoid forward declarations of static functions (Peter Krempa) - numa: Introduce virNumaIsAvailable and use it instead of numa_available (Peter Krempa) Cleanups: - Remove obsolete 'tests' makefile target (Daniel P. Berrange) - Mostly revert "python: remove virConnectGetCPUModelNames from globals" (Daniel P. Berrange) - Remove redundant braces (Ján Tomko) - virPCIDeviceBindToStub: Remove unused @oldDriverPath and @oldDriverName (Michal Privoznik) Thanks to everybody who have helped on this release, with bug reports, fixes, features or documentation updates ! 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] Link libvirt-sandbox from apps page
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add a link to the http://sandbox.libvirt.org sub-site from the list of libraries related to libvirt. Also fix formatting for the ruby libvirt binding. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/apps.html.in | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 3598062..79e46fd 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -277,19 +277,24 @@ host, and there is a subproject to allow merging changes into the Windows Registry in Windows guests. </dd> + + <dt><a href="http://sandbox.libvirt.org">libvirt-sandbox</a></dd> + <dd> + A library and command line tools for simplifying the creation of + application sandboxes using virtualization technology. It currently + supports either KVM, QEMU or LXC as backends. Integration with + systemd facilitates sandboxing of system services like apache. + </dd> + <dt><a href="https://github.com/ohadlevy/virt#readme">Ruby + Libvirt Object bindings</a></dt> + <dd> + Allows using simple ruby objects to manipulate + hypervisors, guests, storage, network etc. It is + based on top of + the <a href="http://libvirt.org/ruby">native ruby bindings</a>. + </dd> </dl> - <dl> - <dt><a href="https://github.com/ohadlevy/virt#readme">Ruby - Libvirt Object bindings</a></dt> - <dd> - Allows using simple ruby objects to manipulate - hypervisors, guests, storage, network etc. It is - based on top of - the <a href="http://libvirt.org/ruby">native ruby - bindings</a>. - </dd> - </dl> <h2><a name="livecd">LiveCD / Appliances</a></h2> <dl> -- 1.8.3.1

2 1

[libvirt] [PATCH v2] Fix memory leak in virNWFilterDefParseXML()
by Nehal J Wani 02 Dec '13

02 Dec '13

While running nwfilterxml2xmltest, it was found that valgrind pointed out the following error... ==7466== 16 bytes in 1 blocks are definitely lost in loss record 26 of 90 ==7466== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==7466== by 0x4C651AD: virAlloc (viralloc.c:142) ==7466== by 0x4D0450D: virNWFilterDefParseNode (nwfilter_conf.c:2575) ==7466== by 0x4D05D84: virNWFilterDefParse (nwfilter_conf.c:2647) ==7466== by 0x401FDE: testCompareXMLToXMLHelper (nwfilterxml2xmltest.c:39) ==7466== by 0x402DE1: virtTestRun (testutils.c:138) ==7466== by 0x4018E9: mymain (nwfilterxml2xmltest.c:111) ==7466== by 0x403482: virtTestMain (testutils.c:593) ==7466== by 0x341F421A04: (below main) (libc-start.c:225) ...21 times, which are related to 21 tests in nwfilterxml2xmltest.c which sent EXPECT_WARN = false. There were two scenarios in virNWFilterDefParseXML(), when the variable 'entry' was malloc'ed, but not freed. --- src/conf/nwfilter_conf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 793cb0e..d280df5 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2576,21 +2576,25 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { goto cleanup; if (xmlStrEqual(curr->name, BAD_CAST "rule")) { - if (!(entry->rule = virNWFilterRuleParse(curr))) + if (!(entry->rule = virNWFilterRuleParse(curr))) { + virNWFilterEntryFree(entry); goto cleanup; + } } else if (xmlStrEqual(curr->name, BAD_CAST "filterref")) { - if (!(entry->include = virNWFilterIncludeParse(curr))) + if (!(entry->include = virNWFilterIncludeParse(curr))) { + virNWFilterEntryFree(entry); goto cleanup; + } } if (entry->rule || entry->include) { if (VIR_REALLOC_N(ret->filterEntries, ret->nentries+1) < 0) { - VIR_FREE(entry); + virNWFilterEntryFree(entry); goto cleanup; } ret->filterEntries[ret->nentries++] = entry; } else - VIR_FREE(entry); + virNWFilterEntryFree(entry); } curr = curr->next; } -- 1.8.1.4

2 1

[libvirt] [PATCH] Fix memory leak in virDomainDefParseXML()
by Nehal J Wani 02 Dec '13

02 Dec '13

This patch fixes the memory leaks found while running qemuxml2argvtest ==8260== 3 bytes in 1 blocks are definitely lost in loss record 1 of 129 ==8260== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==8260== by 0x341F485E21: strdup (strdup.c:42) ==8260== by 0x4CADCFF: virStrdup (virstring.c:554) ==8260== by 0x4CBB839: virXPathString (virxml.c:90) ==8260== by 0x4CE753A: virDomainDefParseXML (domain_conf.c:11478) ==8260== by 0x4CEB4FE: virDomainDefParseNode (domain_conf.c:12742) ==8260== by 0x4CEB675: virDomainDefParse (domain_conf.c:12684) ==8260== by 0x425958: testCompareXMLToArgvHelper (qemuxml2argvtest.c:107) ==8260== by 0x427111: virtTestRun (testutils.c:138) ==8260== by 0x41D3FE: mymain (qemuxml2argvtest.c:452) ==8260== by 0x4277B2: virtTestMain (testutils.c:593) ==8260== by 0x341F421A04: (below main) (libc-start.c:225) ==8260== ==8260== 4 bytes in 1 blocks are definitely lost in loss record 5 of 129 ==8260== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==8260== by 0x341F485E21: strdup (strdup.c:42) ==8260== by 0x4CADCFF: virStrdup (virstring.c:554) ==8260== by 0x4CBB839: virXPathString (virxml.c:90) ==8260== by 0x4CE753A: virDomainDefParseXML (domain_conf.c:11478) ==8260== by 0x4CEB4FE: virDomainDefParseNode (domain_conf.c:12742) ==8260== by 0x4CEB675: virDomainDefParse (domain_conf.c:12684) ==8260== by 0x425958: testCompareXMLToArgvHelper (qemuxml2argvtest.c:107) ==8260== by 0x427111: virtTestRun (testutils.c:138) ==8260== by 0x41D39A: mymain (qemuxml2argvtest.c:451) ==8260== by 0x4277B2: virtTestMain (testutils.c:593) ==8260== by 0x341F421A04: (below main) (libc-start.c:225) ==8260== --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 140eb80..5449bd7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11486,6 +11486,7 @@ virDomainDefParseXML(xmlDocPtr xml, def->features[val] = VIR_DOMAIN_FEATURE_STATE_ON; } ctxt->node = node; + VIR_FREE(tmp); break; case VIR_DOMAIN_FEATURE_LAST: -- 1.8.1.4

2 1

[libvirt] [PATCH] virsh: fix doc typos
by Nehal J Wani 02 Dec '13

02 Dec '13

Fix 6 minor spelling errors in virsh doc --- tools/virsh.pod | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index dac9a08..f51060f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -560,7 +560,7 @@ exits. If I<--pass-fds> is specified, the argument is a comma separated list of open file descriptors which should be pass on into the guest. The -file descriptors will be re-numered in the guest, starting from 3. This +file descriptors will be re-numbered in the guest, starting from 3. This is only supported with container based virtualization. B<Example> @@ -889,7 +889,7 @@ also B<domblklist> for listing these names). If I<--abort> is specified, the active job on the specified disk will be aborted. If I<--async> is also specified, this command will return -immediately, rather than waiting for the cancelation to complete. If +immediately, rather than waiting for the cancellation to complete. If I<--pivot> is specified, this requests that an active copy job be pivoted over to the new copy. If I<--info> is specified, the active job information on the specified @@ -1158,7 +1158,7 @@ hostname which will not resolve to match one of its public IP addresses, then libvirt will generate an incorrect URI. In this case I<migrateuri> should be explicitly specified, using an IP address, or a correct hostname. -=item * The host has multiple network interaces. If a host has multiple network +=item * The host has multiple network interfaces. If a host has multiple network interfaces, it might be desirable for the migration data stream to be sent over a specific interface for either security or performance reasons. In this case I<migrateuri> should be explicitly specified, using an IP address associated @@ -1739,8 +1739,8 @@ hypervisor. Suspend a running domain into one of these states (possible I<target> values): - mem equivallent of S3 ACPI state - disk equivallent of S4 ACPI state + mem equivalent of S3 ACPI state + disk equivalent of S4 ACPI state hybrid RAM is saved to disk but not powered off The I<--duration> argument specifies number of seconds before the domain is @@ -2740,7 +2740,7 @@ B<Supported algorithms> sanitizing removable and non-removable hard disks: random x2, 0x00, verify. dod - 4-pass DoD 5220.22-M section 8-306 procedure for - sanitizing removeable and non-removeable rigid + sanitizing removable and non-removable rigid disks: random, 0x00, 0xff, verify. bsi - 9-pass method recommended by the German Center of Security in Information Technologies -- 1.8.1.4

2 1

[libvirt] [PATCH] Fix typos in various docs
by Nehal J Wani 02 Dec '13

02 Dec '13

Fix 8 minor spelling errors in docs/*.html.in --- docs/api.html.in | 2 +- docs/bugs.html.in | 2 +- docs/drvlxc.html.in | 2 +- docs/firewall.html.in | 4 ++-- docs/internals/rpc.html.in | 2 +- docs/remote.html.in | 2 +- docs/storage.html.in | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/api.html.in b/docs/api.html.in index f77e9db..eae7657 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -207,7 +207,7 @@ virtualization <a href="#Functions">functions</a>. Depending upon the driver being used, calls will be routed through the remote driver to the libvirtd daemon. The daemon will reference the connection specific - driver in order to retreive the requested information and then pass + driver in order to retrieve the requested information and then pass back status and/or data through the connection back to the application. The application can then decide what to do with that data, such as display, write log data, etc. <a href="migration.html">Migration</a> diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 2295ae9..140d1b4 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -148,7 +148,7 @@ ... note the process id from the output # gdb /usr/sbin/libvirtd .... some information about gdb and loading debug data -(gdb) attach $the_damon_process_id +(gdb) attach $the_daemon_process_id .... (gdb) thread apply all bt .... information to attach to the bug diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index d5a4410..7494eb3 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -620,7 +620,7 @@ to PID 1 inside the container. <p> If the container does not respond to the graceful shutdown -request, it can be forceably stopped using the <code>virsh destroy</code> +request, it can be forcibly stopped using the <code>virsh destroy</code> </p> <pre> diff --git a/docs/firewall.html.in b/docs/firewall.html.in index 42642bc..5bb6dc1 100644 --- a/docs/firewall.html.in +++ b/docs/firewall.html.in @@ -142,7 +142,7 @@ MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24</pre> <p><a href="http://www.dmtf.org/standards/cim/cim_schema_v2230/CIM_Network.pdf">http://www.dmtf.org/standards/cim/cim_schema_v2230/CIM_Network.pdf</a></p> <p>The filters are managed in libvirt as a top level, standalone object. This allows the filters to then be referenced by any libvirt object - that requires their functionality, instead tieing them only to use + that requires their functionality, instead tying them only to use by guest NICs. In the current implementation, filters can be associated with individual guest NICs via the libvirt domain XML format. In the future we might allow filters to be associated with the virtual network @@ -272,7 +272,7 @@ f5c78134-9da4-0c60-a9f0-fb37bc21ac1f no-other-rarp-traffic to update them. This ensures the guests have their iptables/ebtables rules recreated. </p> - <p>To associate the clean-trafffic filter with a guest, edit the + <p>To associate the clean-traffic filter with a guest, edit the guest XML config and change the <code><interface></code> element to include a <code><filterref></code> and also specify the whitelisted <code><ip address/></code> the guest is allowed to diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index 40fb59d..627d7aa 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -743,7 +743,7 @@ <p> The main libvirt event loop thread is responsible for performing all - socket I/O. It will read incoming packets from clients and willl + socket I/O. It will read incoming packets from clients and will transmit outgoing packets to clients. It will handle the I/O to/from streams associated with client API calls. When doing client I/O it will also pass the data through any applicable encryption layer diff --git a/docs/remote.html.in b/docs/remote.html.in index 25ae30e..dc9b354 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -376,7 +376,7 @@ Note that parameter values must be <td> libssh2 </td> <td> A comma separated list of authentication methods to use. Default (is - "agent,privkey,keyboard-interactive". The order of the methods is perserved. + "agent,privkey,keyboard-interactive". The order of the methods is preserved. Some methods may require additional parameters. </td> </tr> diff --git a/docs/storage.html.in b/docs/storage.html.in index 6a32c95..2706bc5 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -581,7 +581,7 @@ </target> </volume></pre> - <h3>Example disk attachement</h3> + <h3>Example disk attachment</h3> <p>RBD images can be attached to Qemu guests when Qemu is built with RBD support. Information about attaching a RBD image to a guest can be found -- 1.8.1.4

2 1

[libvirt] FYI: Wiki account self-registration disabled
by Daniel P. Berrange 29 Nov '13

29 Nov '13

Unfortunately evil spammers have managed to defeat all the anti-spam measures we've tried with the wiki. So it is with regret that we have had to disable new wiki account self-registration. We do still welcome contributions from anyone interested in adding wiki content. We just ask that you send a mail to the main devel mailing list (libvir-list(a)redhat.com) to request an account be created for you by the wiki admin. Meanwhile we're hoping to migrate the wiki to new hosting service where we'll be able to deploy newer wiki software and thus hopefully better anti-spam measures. When this happens we'll look at re-enabling self-registration of accounts. 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] Fix memory leak in virNWFilterDefParseXML()
by Nehal J Wani 29 Nov '13

29 Nov '13

While running nwfilterxml2xmltest, it was found that valgrind pointed out the following error... ==7466== 16 bytes in 1 blocks are definitely lost in loss record 26 of 90 ==7466== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==7466== by 0x4C651AD: virAlloc (viralloc.c:142) ==7466== by 0x4D0450D: virNWFilterDefParseNode (nwfilter_conf.c:2575) ==7466== by 0x4D05D84: virNWFilterDefParse (nwfilter_conf.c:2647) ==7466== by 0x401FDE: testCompareXMLToXMLHelper (nwfilterxml2xmltest.c:39) ==7466== by 0x402DE1: virtTestRun (testutils.c:138) ==7466== by 0x4018E9: mymain (nwfilterxml2xmltest.c:111) ==7466== by 0x403482: virtTestMain (testutils.c:593) ==7466== by 0x341F421A04: (below main) (libc-start.c:225) ...21 times, which are related to 21 tests in nwfilterxml2xmltest.c which sent EXPECT_WARN = false. There were two scenarios in virNWFilterDefParseXML(), when the variable 'entry' was malloc'ed, but not freed. --- src/conf/nwfilter_conf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 793cb0e..ee26a62 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2576,11 +2576,15 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { goto cleanup; if (xmlStrEqual(curr->name, BAD_CAST "rule")) { - if (!(entry->rule = virNWFilterRuleParse(curr))) + if (!(entry->rule = virNWFilterRuleParse(curr))) { + VIR_FREE(entry); goto cleanup; + } } else if (xmlStrEqual(curr->name, BAD_CAST "filterref")) { - if (!(entry->include = virNWFilterIncludeParse(curr))) + if (!(entry->include = virNWFilterIncludeParse(curr))) { + VIR_FREE(entry); goto cleanup; + } } if (entry->rule || entry->include) { -- 1.8.1.4

2 4

[libvirt] [PATCH v2] virObject: Error on suspicious ref and unref
by Michal Privoznik 29 Nov '13

29 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=1033061 Since our transformation into virObject is not complete and we must do ref and unref ourselves there's a chance that we will get it wrong. That is, while one thread is doing unref and subsequent dispose another thread may come and do the ref & unref on stale pointer. This results in dispose being called twice (and possibly simultaneously). These kind of errors are hard to catch so we should at least throw an error into logs if such situation occurs. In fact, I've seen a stack trace showing this error had happen (obj = 0x7f4968018260): Thread 2 (Thread 0x7f498596b880 (LWP 13394)): [...] #4 0x00007f496ff44607 in ncf_close (ncf=0x7f496801e3d0) at netcf.c:101 __PRETTY_FUNCTION__ = "ncf_close" #5 0x00007f4984f3f31b in virObjectUnref (anyobj=<optimized out>) at util/virobject.c:262 klass = 0x7f4968019020 obj = 0x7f4968018260 lastRef = true __func__ = "virObjectUnref" #6 0x00007f4970159785 in netcfStateCleanup () at interface/interface_backend_netcf.c:109 No locals. #7 0x00007f4984fc0e28 in virStateCleanup () at libvirt.c:883 i = 6 ret = 0 #8 0x00007f49859b55fd in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1549 srv = 0x7f498696ed00 remote_config_file = 0x0 statuswrite = -1 ret = <optimized out> pid_file_fd = 5 pid_file = 0x0 sock_file = 0x0 sock_file_ro = 0x0 timeout = -1 verbose = 0 godaemon = 0 ipsock = 0 config = 0x7f498696e760 privileged = <optimized out> implicit_conf = <optimized out> run_dir = 0x0 old_umask = <optimized out> opts = {{name = 0x7f49859e2b53 "verbose", has_arg = 0, flag = 0x7fff45057808, val = 118}, {name = 0x7f49859e2b5b "daemon", has_arg = 0, flag = 0x7fff4505780c, val = 100}, {name = 0x7f49859e2b62 "listen", has_arg = 0, flag = 0x7fff45057810, val = 108}, {name = 0x7f49859e2c9f "config", has_arg = 1, flag = 0x0, val = 102}, {name = 0x7f49859e2c00 "timeout", has_arg = 1, flag = 0x0, val = 116}, {name = 0x7f49859e2b69 "pid-file", has_arg = 1, flag = 0x0, val = 112}, {name = 0x7f49859e2b72 "version", has_arg = 0, flag = 0x0, val = 86}, {name = 0x7f49859e2b7a "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" Thread 1 (Thread 0x7f496d6a4700 (LWP 13405)): [...] #6 0x00007f496ff44607 in ncf_close (ncf=0x7f496801e3d0) at netcf.c:101 __PRETTY_FUNCTION__ = "ncf_close" #7 0x00007f4984f3f31b in virObjectUnref (anyobj=<optimized out>) at util/virobject.c:262 klass = 0x7f4968019020 obj = 0x7f4968018260 lastRef = true __func__ = "virObjectUnref" #8 0x00007f4970157752 in netcfInterfaceClose (conn=0x7f49680a3260) at interface/interface_backend_netcf.c:265 No locals. #9 0x00007f4984fb7984 in virConnectDispose (obj=0x7f49680a3260) at datatypes.c:149 conn = 0x7f49680a3260 #10 0x00007f4984f3f31b in virObjectUnref (anyobj=anyobj@entry=0x7f49680a3260) at util/virobject.c:262 klass = 0x7f49681d6760 obj = 0x7f49680a3260 lastRef = true __func__ = "virObjectUnref" #11 0x00007f4984fc11bf in virConnectClose (conn=conn@entry=0x7f49680a3260) at libvirt.c:1532 __func__ = "virConnectClose" __FUNCTION__ = "virConnectClose" #12 0x00007f496eced281 in virLXCProcessAutostartAll (driver=0x7f49681ffaa0) at lxc/lxc_process.c:1426 conn = 0x7f49680a3260 data = {driver = 0x7f49681ffaa0, conn = 0x7f49680a3260} #13 0x00007f4984fc0d21 in virStateInitialize (privileged=true, callback=callback@entry=0x7f49859b7180 <daemonInhibitCallback>, opaque=opaque@entry=0x7f498696ed00) at libvirt.c:864 i = 8 __func__ = "virStateInitialize" #14 0x00007f49859b71db in daemonRunStateInit (opaque=opaque@entry=0x7f498696ed00) at libvirtd.c:906 srv = 0x7f498696ed00 sysident = 0x7f4968000ae0 __func__ = "daemonRunStateInit" #15 0x00007f4984f4efe1 in virThreadHelper (data=<optimized out>) at util/virthreadpthread.c:161 args = 0x0 local = {func = 0x7f49859b71a0 <daemonRunStateInit>, opaque = 0x7f498696ed00} #16 0x00007f4982a40de3 in start_thread (arg=0x7f496d6a4700) at pthread_create.c:308 __res = <optimized out> pd = 0x7f496d6a4700 now = <optimized out> unwind_buf = {cancel_jmp_buf = {{jmp_buf = {139953345021696, 7118305506502180663, 0, 139953345022400, 139953345021696, 140734351374104, -7179978120810397897, -7180347023594422473}, mask_was_saved = 0}}, priv = {pad = {0x0, 0x0, 0x0, 0x0}, data = {prev = 0x0, cleanup = 0x0, canceltype = 0}}} not_first_call = <optimized out> pagesize_m1 = <optimized out> sp = <optimized out> freesize = <optimized out> #17 0x00007f498236716d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:113 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - s/virReportError/VIR_ERROR/ - fix bool = int assignment src/nwfilter/nwfilter_dhcpsnoop.c | 6 ++--- src/util/viratomic.h | 53 +++++++++++++++++++++++++++++++-------- src/util/virobject.c | 13 +++++++--- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index e8fcfef..71380bb 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -893,7 +893,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, skip_instantiate: VIR_FREE(ipl); - virAtomicIntDecAndTest(&virNWFilterSnoopState.nLeases); + virAtomicIntDec(&virNWFilterSnoopState.nLeases); lease_not_found: VIR_FREE(ipstr); @@ -1169,7 +1169,7 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata, void *opaque) _("Instantiation of rules failed on " "interface '%s'"), req->ifname); } - virAtomicIntDecAndTest(job->qCtr); + virAtomicIntDec(job->qCtr); VIR_FREE(job); } @@ -1562,7 +1562,7 @@ exit: pcap_close(pcapConf[i].handle); } - virAtomicIntDecAndTest(&virNWFilterSnoopState.nThreads); + virAtomicIntDec(&virNWFilterSnoopState.nThreads); return; } diff --git a/src/util/viratomic.h b/src/util/viratomic.h index 4d7f7e5..48450b9 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -68,6 +68,18 @@ VIR_STATIC int virAtomicIntInc(volatile int *atomic) ATTRIBUTE_NONNULL(1); /** + * virAtomicIntDec: + * Decrements the value of atomic by 1. + * + * Think of this operation as an atomic version of + * { *atomic -= 1; return *atomic == 0; } + * + * This call acts as a full compiler and hardware memory barrier. + */ +VIR_STATIC int virAtomicIntDec(volatile int *atomic) + ATTRIBUTE_NONNULL(1); + +/** * virAtomicIntDecAndTest: * Decrements the value of atomic by 1. * @@ -75,6 +87,8 @@ VIR_STATIC int virAtomicIntInc(volatile int *atomic) * { *atomic -= 1; return *atomic == 0; } * * This call acts as a full compiler and hardware memory barrier. + * Returns true if the resulting decremented value is zero, + * false otherwise. */ VIR_STATIC bool virAtomicIntDecAndTest(volatile int *atomic) ATTRIBUTE_NONNULL(1); @@ -176,12 +190,15 @@ VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic, (void)(0 ? *(atomic) ^ *(atomic) : 0); \ __sync_add_and_fetch((atomic), 1); \ })) +# define virAtomicIntDec(atomic) \ + (__extension__ ({ \ + (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void)(0 ? *(atomic) ^ *(atomic) : 0); \ + __sync_sub_and_fetch((atomic), 1); \ + })) # define virAtomicIntDecAndTest(atomic) \ - (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ *(atomic) : 0); \ - __sync_fetch_and_sub((atomic), 1) == 1; \ - })) + (virAtomicIntDec(atomic) == 0) + # define virAtomicIntCompareExchange(atomic, oldval, newval) \ (__extension__ ({ \ (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ @@ -252,10 +269,16 @@ virAtomicIntInc(volatile int *atomic) return InterlockedIncrement((volatile LONG *)atomic); } +static inline int +virAtomicIntDec(volatile int *atomic) +{ + return InterlockedDecrement((volatile LONG *)atomic); +} + static inline bool virAtomicIntDecAndTest(volatile int *atomic) { - return InterlockedDecrement((volatile LONG *)atomic) == 0; + return virAtomicIntDec(atomic) == 0; } static inline bool @@ -334,16 +357,22 @@ virAtomicIntInc(volatile int *atomic) return value; } -static inline bool -virAtomicIntDecAndTest(volatile int *atomic) +static inline int +virAtomicIntDec(volatile int *atomic) { - bool is_zero; + int value; pthread_mutex_lock(&virAtomicLock); - is_zero = --(*atomic) == 0; + value = --(*atomic); pthread_mutex_unlock(&virAtomicLock); - return is_zero; + return value; +} + +static inline bool +virAtomicIntDecAndTest(volatile int *atomic) +{ + return virAtomicIntDec(atomic) == 0; } static inline bool @@ -436,6 +465,8 @@ virAtomicIntXor(volatile unsigned int *atomic, virAtomicIntSet((int *)atomic, val) # define virAtomicIntInc(atomic) \ virAtomicIntInc((int *)atomic) +# define virAtomicIntDec(atomic) \ + virAtomicIntDec((int *)atomic) # define virAtomicIntDecAndTest(atomic) \ virAtomicIntDecAndTest((int *)atomic) # define virAtomicIntCompareExchange(atomic, oldval, newval) \ diff --git a/src/util/virobject.c b/src/util/virobject.c index 61b5413..a398ab5 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -252,9 +252,9 @@ bool virObjectUnref(void *anyobj) if (!obj) return false; - bool lastRef = virAtomicIntDecAndTest(&obj->refs); + int newRefs = virAtomicIntDec(&obj->refs); PROBE(OBJECT_UNREF, "obj=%p", obj); - if (lastRef) { + if (newRefs == 0) { PROBE(OBJECT_DISPOSE, "obj=%p", obj); virClassPtr klass = obj->klass; while (klass) { @@ -268,9 +268,11 @@ bool virObjectUnref(void *anyobj) obj->magic = 0xDEADBEEF; obj->klass = (void*)0xDEADBEEF; VIR_FREE(obj); + } else if (newRefs < 0) { + VIR_ERROR(_("Suspicious unrefing of object %p"), anyobj); } - return !lastRef; + return newRefs > 0; } @@ -289,8 +291,11 @@ void *virObjectRef(void *anyobj) if (!obj) return NULL; - virAtomicIntInc(&obj->refs); + bool firstRef = virAtomicIntInc(&obj->refs) <= 1; PROBE(OBJECT_REF, "obj=%p", obj); + if (firstRef) { + VIR_ERROR(_("Suspicious refing of object %p"), anyobj); + } return anyobj; } -- 1.8.4.4

1 1

[libvirt] [PATCH] virObject: Error on suspicious ref and unref
by Michal Privoznik 28 Nov '13

28 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=1033061 Since our transformation into virObject is not complete and we must do ref and unref ourselves there's a chance that we will get it wrong. That is, while one thread is doing unref and subsequent dispose another thread may come and do the ref & unref on stale pointer. This results in dispose being called twice (and possibly simultaneously). These kind of errors are hard to catch so we should at least throw an error into logs if such situation occurs. In fact, I've seen a stack trace showing this error had happen (obj = 0x7f4968018260): Thread 2 (Thread 0x7f498596b880 (LWP 13394)): [...] #4 0x00007f496ff44607 in ncf_close (ncf=0x7f496801e3d0) at netcf.c:101 __PRETTY_FUNCTION__ = "ncf_close" #5 0x00007f4984f3f31b in virObjectUnref (anyobj=<optimized out>) at util/virobject.c:262 klass = 0x7f4968019020 obj = 0x7f4968018260 lastRef = true __func__ = "virObjectUnref" #6 0x00007f4970159785 in netcfStateCleanup () at interface/interface_backend_netcf.c:109 No locals. #7 0x00007f4984fc0e28 in virStateCleanup () at libvirt.c:883 i = 6 ret = 0 #8 0x00007f49859b55fd in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1549 srv = 0x7f498696ed00 remote_config_file = 0x0 statuswrite = -1 ret = <optimized out> pid_file_fd = 5 pid_file = 0x0 sock_file = 0x0 sock_file_ro = 0x0 timeout = -1 verbose = 0 godaemon = 0 ipsock = 0 config = 0x7f498696e760 privileged = <optimized out> implicit_conf = <optimized out> run_dir = 0x0 old_umask = <optimized out> opts = {{name = 0x7f49859e2b53 "verbose", has_arg = 0, flag = 0x7fff45057808, val = 118}, {name = 0x7f49859e2b5b "daemon", has_arg = 0, flag = 0x7fff4505780c, val = 100}, {name = 0x7f49859e2b62 "listen", has_arg = 0, flag = 0x7fff45057810, val = 108}, {name = 0x7f49859e2c9f "config", has_arg = 1, flag = 0x0, val = 102}, {name = 0x7f49859e2c00 "timeout", has_arg = 1, flag = 0x0, val = 116}, {name = 0x7f49859e2b69 "pid-file", has_arg = 1, flag = 0x0, val = 112}, {name = 0x7f49859e2b72 "version", has_arg = 0, flag = 0x0, val = 86}, {name = 0x7f49859e2b7a "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" Thread 1 (Thread 0x7f496d6a4700 (LWP 13405)): [...] #6 0x00007f496ff44607 in ncf_close (ncf=0x7f496801e3d0) at netcf.c:101 __PRETTY_FUNCTION__ = "ncf_close" #7 0x00007f4984f3f31b in virObjectUnref (anyobj=<optimized out>) at util/virobject.c:262 klass = 0x7f4968019020 obj = 0x7f4968018260 lastRef = true __func__ = "virObjectUnref" #8 0x00007f4970157752 in netcfInterfaceClose (conn=0x7f49680a3260) at interface/interface_backend_netcf.c:265 No locals. #9 0x00007f4984fb7984 in virConnectDispose (obj=0x7f49680a3260) at datatypes.c:149 conn = 0x7f49680a3260 #10 0x00007f4984f3f31b in virObjectUnref (anyobj=anyobj@entry=0x7f49680a3260) at util/virobject.c:262 klass = 0x7f49681d6760 obj = 0x7f49680a3260 lastRef = true __func__ = "virObjectUnref" #11 0x00007f4984fc11bf in virConnectClose (conn=conn@entry=0x7f49680a3260) at libvirt.c:1532 __func__ = "virConnectClose" __FUNCTION__ = "virConnectClose" #12 0x00007f496eced281 in virLXCProcessAutostartAll (driver=0x7f49681ffaa0) at lxc/lxc_process.c:1426 conn = 0x7f49680a3260 data = {driver = 0x7f49681ffaa0, conn = 0x7f49680a3260} #13 0x00007f4984fc0d21 in virStateInitialize (privileged=true, callback=callback@entry=0x7f49859b7180 <daemonInhibitCallback>, opaque=opaque@entry=0x7f498696ed00) at libvirt.c:864 i = 8 __func__ = "virStateInitialize" #14 0x00007f49859b71db in daemonRunStateInit (opaque=opaque@entry=0x7f498696ed00) at libvirtd.c:906 srv = 0x7f498696ed00 sysident = 0x7f4968000ae0 __func__ = "daemonRunStateInit" #15 0x00007f4984f4efe1 in virThreadHelper (data=<optimized out>) at util/virthreadpthread.c:161 args = 0x0 local = {func = 0x7f49859b71a0 <daemonRunStateInit>, opaque = 0x7f498696ed00} #16 0x00007f4982a40de3 in start_thread (arg=0x7f496d6a4700) at pthread_create.c:308 __res = <optimized out> pd = 0x7f496d6a4700 now = <optimized out> unwind_buf = {cancel_jmp_buf = {{jmp_buf = {139953345021696, 7118305506502180663, 0, 139953345022400, 139953345021696, 140734351374104, -7179978120810397897, -7180347023594422473}, mask_was_saved = 0}}, priv = {pad = {0x0, 0x0, 0x0, 0x0}, data = {prev = 0x0, cleanup = 0x0, canceltype = 0}}} not_first_call = <optimized out> pagesize_m1 = <optimized out> sp = <optimized out> freesize = <optimized out> #17 0x00007f498236716d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:113 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 ++--- src/util/viratomic.h | 53 +++++++++++++++++++++++++++++++-------- src/util/virobject.c | 17 ++++++++++--- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index e8fcfef..71380bb 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -893,7 +893,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, skip_instantiate: VIR_FREE(ipl); - virAtomicIntDecAndTest(&virNWFilterSnoopState.nLeases); + virAtomicIntDec(&virNWFilterSnoopState.nLeases); lease_not_found: VIR_FREE(ipstr); @@ -1169,7 +1169,7 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata, void *opaque) _("Instantiation of rules failed on " "interface '%s'"), req->ifname); } - virAtomicIntDecAndTest(job->qCtr); + virAtomicIntDec(job->qCtr); VIR_FREE(job); } @@ -1562,7 +1562,7 @@ exit: pcap_close(pcapConf[i].handle); } - virAtomicIntDecAndTest(&virNWFilterSnoopState.nThreads); + virAtomicIntDec(&virNWFilterSnoopState.nThreads); return; } diff --git a/src/util/viratomic.h b/src/util/viratomic.h index 4d7f7e5..877900e 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -68,6 +68,18 @@ VIR_STATIC int virAtomicIntInc(volatile int *atomic) ATTRIBUTE_NONNULL(1); /** + * virAtomicIntDec: + * Decrements the value of atomic by 1. + * + * Think of this operation as an atomic version of + * { *atomic -= 1; return *atomic == 0; } + * + * This call acts as a full compiler and hardware memory barrier. + */ +VIR_STATIC int virAtomicIntDec(volatile int *atomic) + ATTRIBUTE_NONNULL(1); + +/** * virAtomicIntDecAndTest: * Decrements the value of atomic by 1. * @@ -75,6 +87,8 @@ VIR_STATIC int virAtomicIntInc(volatile int *atomic) * { *atomic -= 1; return *atomic == 0; } * * This call acts as a full compiler and hardware memory barrier. + * Returns true if the resulting decremented value is zero, + * false otherwise. */ VIR_STATIC bool virAtomicIntDecAndTest(volatile int *atomic) ATTRIBUTE_NONNULL(1); @@ -176,12 +190,15 @@ VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic, (void)(0 ? *(atomic) ^ *(atomic) : 0); \ __sync_add_and_fetch((atomic), 1); \ })) +# define virAtomicIntDec(atomic) \ + (__extension__ ({ \ + (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void)(0 ? *(atomic) ^ *(atomic) : 0); \ + __sync_sub_and_fetch((atomic), 1); \ + })) # define virAtomicIntDecAndTest(atomic) \ - (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ *(atomic) : 0); \ - __sync_fetch_and_sub((atomic), 1) == 1; \ - })) + (virAtomicIntDec(atomic) == 0) + # define virAtomicIntCompareExchange(atomic, oldval, newval) \ (__extension__ ({ \ (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ @@ -252,10 +269,16 @@ virAtomicIntInc(volatile int *atomic) return InterlockedIncrement((volatile LONG *)atomic); } +static inline int +virAtomicIntDec(volatile int *atomic) +{ + return InterlockedDecrement((volatile LONG *)atomic); +} + static inline bool virAtomicIntDecAndTest(volatile int *atomic) { - return InterlockedDecrement((volatile LONG *)atomic) == 0; + return virAtomicIntDec(atomic) == 0; } static inline bool @@ -334,16 +357,22 @@ virAtomicIntInc(volatile int *atomic) return value; } -static inline bool -virAtomicIntDecAndTest(volatile int *atomic) +static inline int +virAtomicIntDec(volatile int *atomic) { - bool is_zero; + bool value; pthread_mutex_lock(&virAtomicLock); - is_zero = --(*atomic) == 0; + value = --(*atomic); pthread_mutex_unlock(&virAtomicLock); - return is_zero; + return value; +} + +static inline int +virAtomicIntDecAndTest(volatile int *atomic) +{ + return virAtomicIntDec(atomic) == 0; } static inline bool @@ -436,6 +465,8 @@ virAtomicIntXor(volatile unsigned int *atomic, virAtomicIntSet((int *)atomic, val) # define virAtomicIntInc(atomic) \ virAtomicIntInc((int *)atomic) +# define virAtomicIntDec(atomic) \ + virAtomicIntDec((int *)atomic) # define virAtomicIntDecAndTest(atomic) \ virAtomicIntDecAndTest((int *)atomic) # define virAtomicIntCompareExchange(atomic, oldval, newval) \ diff --git a/src/util/virobject.c b/src/util/virobject.c index 61b5413..4299432 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -252,9 +252,9 @@ bool virObjectUnref(void *anyobj) if (!obj) return false; - bool lastRef = virAtomicIntDecAndTest(&obj->refs); + int newRefs = virAtomicIntDec(&obj->refs); PROBE(OBJECT_UNREF, "obj=%p", obj); - if (lastRef) { + if (newRefs == 0) { PROBE(OBJECT_DISPOSE, "obj=%p", obj); virClassPtr klass = obj->klass; while (klass) { @@ -268,9 +268,13 @@ bool virObjectUnref(void *anyobj) obj->magic = 0xDEADBEEF; obj->klass = (void*)0xDEADBEEF; VIR_FREE(obj); + } else if (newRefs < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Suspicious unrefing of object %p"), + anyobj); } - return !lastRef; + return newRefs > 0; } @@ -289,8 +293,13 @@ void *virObjectRef(void *anyobj) if (!obj) return NULL; - virAtomicIntInc(&obj->refs); + bool firstRef = virAtomicIntInc(&obj->refs) <= 1; PROBE(OBJECT_REF, "obj=%p", obj); + if (firstRef) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Suspicious refing of object %p"), + anyobj); + } return anyobj; } -- 1.8.4.4

3 3