- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Fix memory leaks
by ajia＠redhat.com 31 Dec '11

31 Dec '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. Leaks introduced in commit 93ab585 and commit e8d6b29. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fbaa824..6a1e7cc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6014,6 +6014,7 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, } if (j != ndevices) { ret = -1; + VIR_FREE(devices); continue; } if (qemuDomainMergeDeviceWeights(&vm->def->blkio.devices, @@ -7867,7 +7868,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virDomainDefPtr persistentDef = NULL; int ret = -1; virDomainNetDefPtr net = NULL, persistentNet = NULL; - virNetDevBandwidthPtr bandwidth = NULL; + virNetDevBandwidthPtr bandwidth = NULL, newBandwidth = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -7989,8 +7990,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - virNetDevBandwidthPtr newBandwidth; - if (VIR_ALLOC(newBandwidth) < 0) { virReportOOMError(); goto cleanup; @@ -8056,6 +8055,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, ret = 0; cleanup: virNetDevBandwidthFree(bandwidth); + virNetDevBandwidthFree(newBandwidth); virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); -- 1.7.1

2 2

[libvirt] [PATCHv2 0/6] Expose per-disk label overrides.
by Eric Blake 31 Dec '11

31 Dec '11

In a system that uses dynamic_ownership=0 and NFS disks, the _only_ path in the virDomainDestroy path where libvirt itself performs a syscall on the NFS file system was on attempting to relabel a disk back to its default label. If an NFS server hosting a domain's disk image hangs, then this renders libvirtd stuck in an lstat() call, with the driver lock held, effectively blocking out _all_ other attempts to connect to libvirtd for any remaining domains not tied to the hung NFS server. (Verification that the SELinux relabel was the only point where libvirtd, rather than not qemu, could hang, was done by Red Hat VDSM folks in https://bugzilla.redhat.com/746666; with a hack to avoid the relabel, the destroy no longer hangs.) But without bleeding edge NFS servers, you can't put a SELinux label on the file in the first place; libvirt was happily ignoring the failure to change the label on domain start (thanks to the selinux virt_use_nfs bool), only to hang on the stuck server on domain destroy that it would have again ignored had the server not been stuck. If we allow the users to modify the XML to mark that a file does not need to be labeled in the first place, then we can avoid both attempts to label at startup and relabel at destroy, thus preventing libvirtd from getting stuck on a virDomainDestroy() called on a guest whose NFS server went down. This patch series is based on an earlier attempt (the hack which got tested in the above-mentioned bz 746666), incorporating feedback from Dan Berrange suggesting that the ability for the user to override labeling on a per-disk basis is smarter than marking ignored failure to label in internal XML used only by libvirtd: v1: https://www.redhat.com/archives/libvir-list/2011-December/msg00246.html I'm still working on patch 6/6 (actually hooking up the security manager to honor the relabel='no' request), and hope to post that tomorrow as part of this thread; that's really the only patch that resembles anything from v1 (the first 5 patches are basically brand new to this series), but I'm posting the first 5 patches now to get review started and make sure the proposed XML makes sense. I envision that this can be further expanded (sticking <seclabel> elements on more XML items that get labeled in the host), but for now I focused just on disk devices, as those are the most likely to reside over NFS. Ultimately, this patch series is only a bandaid; the underlying problem (making a syscall that can block indefinitely on a hung NFS server while holding the driver lock) is still present, and triggered if you have dynamic_ownership=1 (where we also attempt a chown of the disk image, regardless of the SELinux labels). Later down the road, I also plan to work on Dan's proposal to break the driver lock into smaller, more manageable sections, so we can get back to our documented goal of never blocking while holding lock, but instead using the job condition variables to detect when a single domain is stuck on a blocked call: https://www.redhat.com/archives/libvir-list/2011-November/msg00267.html Eric Blake (5): schema: rewrite seclabel rng to match code seclabel: refactor existing domain_conf usage seclabel: move seclabel stuff earlier seclabel: extend XML to allow per-disk label overrides seclabel: allow a seclabel override on a disk src docs/formatdomain.html.in | 29 ++- docs/schemas/domaincommon.rng | 115 +++++-- src/conf/domain_conf.c | 414 ++++++++++++-------- src/conf/domain_conf.h | 39 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 4 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 28 ++ .../qemuxml2argv-seclabel-dynamic-override.args | 5 + .../qemuxml2argv-seclabel-dynamic-override.xml | 40 ++ .../qemuxml2argv-seclabel-dynamic.args | 4 + .../qemuxml2argv-seclabel-dynamic.xml | 26 ++ .../qemuxml2argv-seclabel-static-relabel.args | 4 + .../qemuxml2argv-seclabel-static-relabel.xml | 29 ++ .../qemuxml2argv-seclabel-static.args | 4 + .../qemuxml2argv-seclabel-static.xml | 28 ++ tests/qemuxml2argvtest.c | 6 + tests/qemuxml2xmltest.c | 4 + 16 files changed, 575 insertions(+), 204 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml -- 1.7.7.4

3 11

[libvirt] [PATCH 0/3] python: Fix memory leaks
by ajia＠redhat.com 31 Dec '11

31 Dec '11

From: Alex Jia <ajia(a)redhat.com> This series patches fix memory leaks issues. Detected by valgrind. Alex Jia (3): * python/libvirt-override.c: fix memory leaks on libvirt_virDomainBlockStatsFlags. * python/libvirt-override.c: fix memory leaks on libvirt_virDomainGetSchedulerParameters and libvirt_virDomainGetSchedulerParametersFlags. * python/libvirt-override.c: fix memory leaks on libvirt_virDomainGetMemoryParameters. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..a138090 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -176,6 +176,8 @@ libvirt_virDomainBlockStatsFlags(PyObject *self ATTRIBUTE_UNUSED, key = libvirt_constcharPtrWrap(params[i].field); PyDict_SetItem(info, key, val); + Py_DECREF(key); + Py_DECREF(val); } free(params); @@ -369,6 +371,8 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, key = libvirt_constcharPtrWrap(params[i].field); PyDict_SetItem(info, key, val); + Py_DECREF(key); + Py_DECREF(val); } free(params); return(info); @@ -451,6 +455,8 @@ libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, key = libvirt_constcharPtrWrap(params[i].field); PyDict_SetItem(info, key, val); + Py_DECREF(key); + Py_DECREF(val); } free(params); return(info); @@ -994,6 +1000,8 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, key = libvirt_constcharPtrWrap(params[i].field); PyDict_SetItem(info, key, val); + Py_DECREF(key); + Py_DECREF(val); } free(params); return(info); -- 1.7.1

2 2

[libvirt] [test-API][PATCH v2] Add and update functions in domainAPI
by Wayne Sun 30 Dec '11

30 Dec '11

* add 9 new block related functions block_pull(self, domname, device, bandwidth = 0, flag = 0) block_resize(self, domname, device, size, flag = 0) block_job_abort(self, domname, device, flag = 0) block_job_set_speed(self, domname, device, bandwidth, flag = 0) get_block_job_info(self, domname, device, flag = 0) get_blkio_parameters(self, domname, flag) get_block_io_tune(self, domname, device, flag) set_blkio_parameters(self, domname, params, flag) set_block_io_tune(self, domname, device, params, flag) 2 bugs related to parameters for 4 functions(get_blkio_parameters, get_block_io_tune, set_blkio_parameters and set_block_io_tune), it is considered in this patch, it could be updated later anyway. * Add 2 memory parameters function get_memory_parameters(self, domname, flag) set_memory_parameters(self, domname, params, flag) For set_memory_parameters(), the 'params' arguments should be a dictionary contains selectable keys: hard_limit, soft_limit, swap_hard_limit. e.g. {'hard_limit':10240, 'soft_limit':100000, 'swap_hard_limit':102400} * Fix problems of 2 functions memory_peek(self, domname) set_sched_params_flags(self, domname, params, flags) --- lib/domainAPI.py | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 2 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index a6efab7..91f2ba3 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -546,7 +546,7 @@ class DomainAPI(object): def set_sched_params_flags(self, domname, params, flags): try: dom_obj = self.get_domain_by_name(domname) - retval = dom_obj.setSchedulerParameters(params, flags) + retval = dom_obj.setSchedulerParametersFlags(params, flags) return retval except libvirt.libvirtError, e: message = e.get_error_message() @@ -581,6 +581,105 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def block_pull(self, domname, device, bandwidth = 0, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockPull(device, bandwidth, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def block_resize(self, domname, device, size, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockResize(device, size, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def block_job_abort(self, domname, device, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockJobAbort(device, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def block_job_set_speed(self, domname, device, bandwidth, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockJobSetSpeed(device, bandwidth, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_block_job_info(self, domname, device, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockJobInfo(device, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_blkio_parameters(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blkioParameters(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_block_io_tune(self, domname, device, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockIoTune(device, params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def set_blkio_parameters(self, domname, params, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.setBlkioParameters(params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def set_block_io_tune(self, domname, device, params, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.setBlockIoTune(device, params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_memory_parameters(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.memoryParameters(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def set_memory_parameters(self, domname, params, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.setMemoryParameters(params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def memory_stats(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -593,7 +692,7 @@ class DomainAPI(object): def memory_peek(self, domname, start, size, buffer, flag = 0): try: dom_obj = self.get_domain_by_name(domname) - return dom_obj.blockPeek(start, size, buffer, flag) + return dom_obj.memoryPeek(start, size, buffer, flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add and update functions in domainAPI
by Wayne Sun 30 Dec '11

30 Dec '11

* add 9 new block related functions block_pull(self, domname, path, bandwidth = 0, flag = 0) block_resize(self, domname, path, size, flag = 0) block_job_abort(self, domname, path, flag = 0) block_job_set_speed(self, domname, path, bandwidth, flag = 0) get_block_job_info(self, domname, path, flag = 0) get_blkio_parameters(self, domname, flag) get_block_io_tune(self, domname, path, flag) set_blkio_parameters(self, domname, params, flag) set_block_io_tune(self, domname, path, params, flag) 2 bugs related to parameters for 4 functions(get_blkio_parameters, get_block_io_tune, set_blkio_parameters and set_block_io_tune), it is considered in this patch, it could be updated later anyway. * Add 2 memory parameters function get_memory_parameters(self, domname, flag) set_memory_parameters(self, domname, params, flag) For set_memory_parameters(), the 'params' arguments should be a dictionary contains selectable keys: hard_limit, soft_limit, swap_hard_limit. e.g. {'hard_limit':10240, 'soft_limit':100000, 'swap_hard_limit':102400} * update 2 functions with problem memory_stats(self, domname) set_sched_params_flags(self, domname, params, flags) --- lib/domainAPI.py | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 2 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index a6efab7..1f6ef49 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -546,7 +546,7 @@ class DomainAPI(object): def set_sched_params_flags(self, domname, params, flags): try: dom_obj = self.get_domain_by_name(domname) - retval = dom_obj.setSchedulerParameters(params, flags) + retval = dom_obj.setSchedulerParametersFlags(params, flags) return retval except libvirt.libvirtError, e: message = e.get_error_message() @@ -581,6 +581,105 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def block_pull(self, domname, path, bandwidth = 0, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockPull(path, bandwidth, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def block_resize(self, domname, path, size, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockResize(path, size, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def block_job_abort(self, domname, path, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockJobAbort(path, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def block_job_set_speed(self, domname, path, bandwidth, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockJobSetSpeed(path, bandwidth, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_block_job_info(self, domname, path, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockJobInfo(path, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_blkio_parameters(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blkioParameters(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_block_io_tune(self, domname, path, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.blockIoTune(path, params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def set_blkio_parameters(self, domname, params, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.setBlkioParameters(params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def set_block_io_tune(self, domname, path, params, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.setBlockIoTune(path, params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_memory_parameters(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.memoryParameters(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def set_memory_parameters(self, domname, params, flag): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.setMemoryParameters(params, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def memory_stats(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -593,7 +692,7 @@ class DomainAPI(object): def memory_peek(self, domname, start, size, buffer, flag = 0): try: dom_obj = self.get_domain_by_name(domname) - return dom_obj.blockPeek(start, size, buffer, flag) + return dom_obj.memoryPeek(start, size, buffer, flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() -- 1.7.1

2 2

[libvirt] How to connect to a remote VM ESXi server with Python language?
by ice 30 Dec '11

30 Dec '11

Hi, Dear Mr/Mrs. I have trouble in connecting to a VM ESXi server with python. I am a developer using libvirt to control remote VM ESXi with python language. But I am not able to connect to a remote VM ESXi server. I make my try to solve this issue: 1: I use the function libvirt.Open() to open the remote VM ESXi Server, but I don't know how to input the password. It seems that there is no parameter for password input. 2: I use "virsh connect ---". It is succeed when it is executed on locale machine manual, but failed when I invoke this command in python environment. I use "subprocess.Popen" to execute the command "virsh", but this function would be hung on after command "communicate" executed. -bash-4.1# python Python 2.6.6 (r266:84292, May 20 2011, 16:42:11) [GCC 4.4.5 20110214 (Red Hat 4.4.5-6)] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> from subprocess import Popen,PIPE,STDOUT >>> command=['virsh', '-c', 'esx://192.168.58.144/?no_verify=1','list', '--all'] >>> p=Popen(command, stdin=PIPE,stdout=PIPE, stderr=STDOUT) >>> output = p.communicate()[0] How to fix it? Thanks for help! Best regards!

2 2

[libvirt] [PATCH] Fix build on s390(x) and other stange arches
by Daniel Veillard 30 Dec '11

30 Dec '11

The blocks to extract node information on a per-arch basis wasn't well balanced leading to a compilation failure if not on one of the handled arches (PCs and PPCs) Pushed under the build breaker rule, but is not part of 0.9.9-rc1 as I discovered it after the release. diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 7537918..e0b66f7 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -249,6 +249,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* Accept trailing fractional part. */ && (*p == '\0' || *p == '.' || c_isspace(*p))) nodeinfo->mhz = ui; + } # elif defined(__powerpc__) || \ defined(__powerpc64__) if (STRPREFIX(buf, "clock")) { @@ -271,10 +272,10 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * identification and machine, but we don't want it to be caught * and parsed in next iteration, because it is not in expected * format and thus lead to error. */ + } # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif - } } /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the core, socket -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] python: Fix problems of virDomain{Set, Get}BlkioParameters bindings
by ajia＠redhat.com 30 Dec '11

30 Dec '11

From: Alex Jia <ajia(a)redhat.com> The parameter 'device_weight' is a string, however, the 'VIR_TYPED_PARAM_STRING' type condition is missed by libvirt_virDomain{Set, Get}BlkioParameters bindings, the result is we can't get or change 'device_weight' value. * python/libvirt-override.c: Add missing 'VIR_TYPED_PARAM_STRING' condition into libvirt_virDomain{Set, Get}BlkioParameters bindings. https://bugzilla.redhat.com/show_bug.cgi?id=770795 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..c8ea3dc 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -726,6 +726,10 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, } break; + case VIR_TYPED_PARAM_STRING: + params[i].value.s = PyString_AsString(val); + break; + default: free(params); return VIR_PY_INT_FAIL; @@ -811,6 +815,10 @@ libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, val = PyBool_FromLong((long)params[i].value.b); break; + case VIR_TYPED_PARAM_STRING: + val = PyString_FromString((char *)params[i].value.s); + break; + default: free(params); Py_DECREF(info); -- 1.7.1

3 2

[libvirt] [PATCH] Require avahi as an rpm dependancy
by Daniel Veillard 29 Dec '11

29 Dec '11

As seen in https://bugzilla.redhat.com/show_bug.cgi?id=746111 If compiled with the daemon and avahi support, then it's better to require avahi at the rpm level to avoid daemon startup errors. diff --git a/libvirt.spec.in b/libvirt.spec.in index 5537c51..dd5e32f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -272,6 +272,9 @@ Requires: %{name}-client = %{version}-%{release} Requires: module-init-tools # for /sbin/ip & /sbin/tc Requires: iproute +%if ! %{with_avahi} +Requires: avahi +%endif %endif %if %{with_network} Requires: dnsmasq >= 2.41 -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] remove a static limit on max domains in python bindings
by Daniel Veillard 29 Dec '11

29 Dec '11

* python/libvirt-override.c: remove the predefined array in the virConnectListDomainsID binding and call virConnectNumOfDomains to do a proper allocation diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8a643a3..2dea16b 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1616,7 +1616,7 @@ static PyObject * libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; - int ids[500], c_retval, i; + int *ids = NULL, c_retval, i; virConnectPtr conn; PyObject *pyobj_conn; @@ -1626,14 +1626,34 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectListDomains(conn, &ids[0], 500); + c_retval = virConnectNumOfDomains(conn); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; + + if (c_retval) { + ids = malloc(sizeof(*ids) * c_retval); + if (!ids) + return VIR_PY_NONE; + + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectListDomains(conn, ids, c_retval); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { + free(ids); + return VIR_PY_NONE; + } + } py_retval = PyList_New(c_retval); - for (i = 0;i < c_retval;i++) { - PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i])); + + if (ids) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i])); + } + free(ids); } + return(py_retval); } Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 6