- Devel - libvirt List Archives

[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

[libvirt] [PATCHv3] python: Fixup python binding for virDomain{Set, Get}BlockIoTune APIs
by ajia＠redhat.com 29 Dec '11

29 Dec '11

From: Alex Jia <ajia(a)redhat.com> The parameter 'params' is useless for virDomainGetBlockIoTune API, and the return value type should be a virTypedParameterPtr not integer. In addition, the parameter number is also incorrect in libvirt_virDomain{Set, Get}BlockIoTune APIs. * libvirt-override-api.xml: Remove useless the parameter 'params' from virDomainGetBlockIoTune API, and change return value type from integer to virTypedParameterPtr. * python/libvirt-override.c: Fix the parameter number match issue. https://bugzilla.redhat.com/show_bug.cgi?id=770683 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 3 +-- python/libvirt-override.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 07e4a78..a2fd219 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -401,9 +401,8 @@ <info>Get the I/O tunables for a block device</info> <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> <arg name='disk' type='const char *' info='disk name'/> - <arg name='params' type='virTypedParameterPtr' info='Pointer to blkio tuning params object'/> <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> - <return type='int' info='0 in case of success, -1 in case of failure'/> + <return type='virTypedParameterPtr' info='the I/O tunables value or None in case of error'/> </function> <function name='virDomainBlockPeek' file='python'> <info>Read the contents of domain's disk device</info> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8a643a3..a704e78 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3301,7 +3301,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0, i; int c_ret; - if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainSetBlockIoTune", + if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", &pyobj_domain, &disk, &pyinfo, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -3395,7 +3395,7 @@ libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, virTypedParameterPtr params; int c_ret; - if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetBlockIoTune", + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetBlockIoTune", &pyobj_domain, &disk, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); -- 1.7.1

3 2

[libvirt] [PATCHv2] python: Fixup python binding for virDomain{Set, Get}BlockIoTune APIs
by ajia＠redhat.com 29 Dec '11

29 Dec '11

From: Alex Jia <ajia(a)redhat.com> python: Fixup python binding for virDomain{Set, Get}BlockIoTune APIs The parameter 'params' is useless for virDomainGetBlockIoTune API, and the return value type should be a virTypedParameterPtr not integer. In addition, the parameter number is also incorrect in libvirt_virDomain{Set, Get}BlockIoTune APIs. * libvirt-override-api.xml: Remove useless the parameter 'params' from virDomainGetBlockIoTune API, and change return value type from integer to virTypedParameterPtr. * python/libvirt-override.c: Fix the parameter number match issue. https://bugzilla.redhat.com/show_bug.cgi?id=770683 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 3 +-- python/libvirt-override.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 07e4a78..a2fd219 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -401,9 +401,8 @@ <info>Get the I/O tunables for a block device</info> <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> <arg name='disk' type='const char *' info='disk name'/> - <arg name='params' type='virTypedParameterPtr' info='Pointer to blkio tuning params object'/> <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> - <return type='int' info='0 in case of success, -1 in case of failure'/> + <return type='virTypedParameterPtr *' info='the I/O tunables value or None in case of error'/> </function> <function name='virDomainBlockPeek' file='python'> <info>Read the contents of domain's disk device</info> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8a643a3..a704e78 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3301,7 +3301,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0, i; int c_ret; - if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainSetBlockIoTune", + if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", &pyobj_domain, &disk, &pyinfo, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -3395,7 +3395,7 @@ libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, virTypedParameterPtr params; int c_ret; - if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetBlockIoTune", + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetBlockIoTune", &pyobj_domain, &disk, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); -- 1.7.1

2 1

[libvirt] [PATCH] python: Fixup python binding for virDomain{Set, Get}BlockIoTune APIs
by ajia＠redhat.com 29 Dec '11

29 Dec '11

From: Alex Jia <ajia(a)redhat.com> python: Fixup python binding for virDomain{Set, Get}BlockIoTune APIs The parameter 'params' is useless for virDomainGetBlockIoTune API, and the return value should be a string not integer. In addition, the parameter number is also incorrect in libvirt_virDomain{Set, Get}BlockIoTune APIs. * libvirt-override-api.xml: Remove useless the parameter 'params' from virDomainGetBlockIoTune API, and change return value type from integer to string. * python/libvirt-override.c: Fix the parameter number match issue. https://bugzilla.redhat.com/show_bug.cgi?id=770683 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 3 +-- python/libvirt-override.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 07e4a78..a2fd219 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -401,9 +401,8 @@ <info>Get the I/O tunables for a block device</info> <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> <arg name='disk' type='const char *' info='disk name'/> - <arg name='params' type='virTypedParameterPtr' info='Pointer to blkio tuning params object'/> <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> - <return type='int' info='0 in case of success, -1 in case of failure'/> + <return type='char *' info='the I/O tunables value or None in case of error'/> </function> <function name='virDomainBlockPeek' file='python'> <info>Read the contents of domain's disk device</info> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8a643a3..a704e78 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3301,7 +3301,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0, i; int c_ret; - if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainSetBlockIoTune", + if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", &pyobj_domain, &disk, &pyinfo, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -3395,7 +3395,7 @@ libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, virTypedParameterPtr params; int c_ret; - if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetBlockIoTune", + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetBlockIoTune", &pyobj_domain, &disk, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); -- 1.7.1

2 1

[libvirt] [PATCH] qemu: fix inf-loop in blkio parameters
by Eric Blake 29 Dec '11

29 Dec '11

https://bugzilla.redhat.com/show_bug.cgi?id=770520 We had two nested loops both trying to use 'i' as the iteration variable, which can result in an infinite loop when the inner loop interferes with the outer loop. Introduced in commit 93ab585. * src/qemu/qemu_driver.c (qemuDomainSetBlkioParameters): Don't reuse iteration variable across two loops. --- Pushing under the trivial rule. src/qemu/qemu_driver.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index eeeb935..a840c1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5982,6 +5982,8 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { size_t ndevices; virBlkioDeviceWeightPtr devices = NULL; + int j; + if (param->type != VIR_TYPED_PARAM_STRING) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", _("invalid type for device_weight tunable, " @@ -5996,19 +5998,19 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; continue; } - for (i = 0; i < ndevices; i++) { + for (j = 0; j < ndevices; i++) { rc = virCgroupSetBlkioDeviceWeight(group, - devices[i].path, - devices[i].weight); + devices[j].path, + devices[j].weight); if (rc < 0) { virReportSystemError(-rc, _("Unable to set io device weight " "for path %s"), - devices[i].path); + devices[j].path); break; } } - if (i != ndevices) { + if (j != ndevices) { ret = -1; continue; } -- 1.7.7.4

2 1

[libvirt] [PATCHv3 0/6] Add new command domiftune
by Hu Tao 28 Dec '11

28 Dec '11

This series adds a new command domiftune to get/set parameters of domain's network interfaces. Supported parameters are bandwidth settings. Currently the network interface bandwidth can only be set: - in domain's xml before the domain is up - when attaching an interface by attach-interface With this series, users can change network interface bandwidth settings using virsh, whether the domain is running or not. changes: - fix some typos - improvements on docs - use virDomainLiveConfigHelperMethod - some improvements in qemu_driver Hu Tao (6): Add API virDomain{S,G}etInterfaceParameters virDomain{S,G}etInterfaceParameters: the main entry points Add virDomain{S,G}etInterfaceparameters support to the remote driver Add a function virDomainFindNetDef Add virDomain{S,G}etInterfaceParameters support to qemu driver Enable the virDomain{S,G}etInterfaceParameters in virsh daemon/remote.c | 64 ++++++++ include/libvirt/libvirt.h.in | 50 ++++++ python/generator.py | 2 + src/conf/domain_conf.c | 39 +++++ src/conf/domain_conf.h | 3 + src/driver.h | 12 ++ src/libvirt.c | 129 ++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 337 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 52 +++++++ src/remote/remote_protocol.x | 28 ++++- src/remote_protocol-structs | 24 +++ tools/virsh.c | 198 +++++++++++++++++++++++++ tools/virsh.pod | 21 +++ 15 files changed, 961 insertions(+), 1 deletions(-) -- 1.7.4.4

2 11

[libvirt] [PATCH] virsh: move version command to virsh group
by Lai Jiangshan 28 Dec '11

28 Dec '11

Trivial patch, move version command to virsh commands group. It has no any related with any domain. It may connect to the daemon, so the flag is 0 but not VSH_CMD_FLAG_NOCONNECT. --- diff --git a/tools/virsh.c b/tools/virsh.c index 02f2e0d..0166bc6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -15641,7 +15641,6 @@ static const vshCmdDef domManagementCmds[] = { {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0}, {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0}, {"vcpupin", cmdVcpuPin, opts_vcpupin, info_vcpupin, 0}, - {"version", cmdVersion, opts_version, info_version, 0}, {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0}, {NULL, NULL, NULL, NULL, 0} }; @@ -15810,6 +15809,7 @@ static const vshCmdDef secretCmds[] = { }; static const vshCmdDef virshCmds[] = { + {"version", cmdVersion, opts_version, info_version, 0}, {"cd", cmdCd, opts_cd, info_cd, VSH_CMD_FLAG_NOCONNECT}, {"echo", cmdEcho, opts_echo, info_echo, VSH_CMD_FLAG_NOCONNECT}, {"exit", cmdQuit, NULL, info_quit, VSH_CMD_FLAG_NOCONNECT},

3 2