- Devel - libvirt List Archives

[libvirt] [PATCH v4] python: refactoring virTypedParameter conversion for NUMA tuning APIs
by Guannan Ren 10 Feb '12

10 Feb '12

*getPyVirTypedParameter *setPyVirTypedParameter *virDomainSetNumaParameters *virDomainGetNumaParameters --- python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 385 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 398 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index b2b8152..8eed0bb 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -248,6 +248,19 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetNumaParameters' file='python'> + <info>Change the NUMA tunables</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to numa tunable objects'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetNumaParameters' file='python'> + <info>Get the NUMA parameters</info> + <return type='str *' info='returns a dictionary of params in case of success, None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 33a841d..3c6020b 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -22,6 +22,7 @@ #include "typewrappers.h" #include "libvirt.h" #include "memory.h" +#include "virtypedparam.h" #ifndef __CYGWIN__ extern void initlibvirtmod(void); @@ -62,6 +63,263 @@ static char *py_str(PyObject *obj) return PyString_AsString(str); } +/* Two helper functions to help the conversions between C to Python + * for the virTypedParameter used in the following APIs */ +static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +getPyVirTypedParameter(PyObject **info, + const virTypedParameterPtr params, int nparams) +{ + PyObject *key, *val; + int i; + + for (i = 0 ; i < nparams ; i++) { + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((unsigned long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromUnsignedLongLong((unsigned long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + return 0; + } + + key = libvirt_constcharPtrWrap(params[i].field); + if (!key || !val) + goto cleanup; + + if (PyDict_SetItem(*info, key, val) < 0) + goto cleanup; + + Py_DECREF(key); + Py_DECREF(val); + } + return 1; +cleanup: + Py_XDECREF(key); + Py_XDECREF(val); + return -1; +} + +/* Allocate a new typed parameter array with the same contents and + * length as info, and using the array params of length nparams as + * hints on what types to use when creating the new array. Return + * NULL on failure. */ +static virTypedParameterPtr ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +setPyVirTypedParameter(PyObject *info, + const virTypedParameterPtr params, int nparams) +{ + PyObject *key, *value; + Py_ssize_t pos = 0; + virTypedParameterPtr temp = NULL, ret = NULL; + int size, i; + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (VIR_ALLOC_N(ret, size) < 0) { + PyErr_NoMemory(); + return NULL; + } + + temp = &ret[0]; + while (PyDict_Next(info, &pos, &key, &value)) { + char *keystr = NULL; + bool found = false; + + if (PyString_Check(key)) { + if ((keystr = PyString_AsString(key)) == NULL) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "Attribut name must be string"); + goto cleanup; + } + + for (i = 0; i < nparams; i++) { + if (STREQ(params[i].field, keystr)) { + found = true; + strncpy(temp->field, params[i].field, + sizeof(temp->field)); + temp->type = params[i].type; + + switch(params[i].type) { + case VIR_TYPED_PARAM_INT: + { + long long_val; + if (PyInt_Check(value)) { + long_val = PyInt_AsLong(value); + if ((long_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be int", keystr); + goto cleanup; + } + + if ((int)long_val == long_val) { + temp->value.i = (int)long_val; + } else { + PyErr_Format(PyExc_ValueError, + "The value of " + "attribute \"%s\" is out of int range", keystr); + goto cleanup; + } + } + break; + case VIR_TYPED_PARAM_UINT: + { + long long_val; + if (PyInt_Check(value)) { + long_val = PyInt_AsLong(value); + if ((long_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be int", keystr); + goto cleanup; + } + + if ((unsigned int)long_val == long_val) { + temp->value.ui = (unsigned int)long_val; + } else { + PyErr_Format(PyExc_ValueError, + "The value of " + "attribute \"%s\" is out of int range", keystr); + goto cleanup; + } + } + break; + case VIR_TYPED_PARAM_LLONG: + { + long long llong_val; + if (PyLong_Check(value)) { + llong_val = PyLong_AsLongLong(value); + if ((llong_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be long", keystr); + goto cleanup; + } + temp->value.l = llong_val; + } + break; + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long ullong_val; + if (PyLong_Check(value)) { + ullong_val = PyLong_AsUnsignedLongLong(value); + if ((ullong_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be long", keystr); + goto cleanup; + + } + temp->value.ul = ullong_val; + } + break; + case VIR_TYPED_PARAM_DOUBLE: + { + double double_val; + if (PyFloat_Check(value)) { + double_val = PyFloat_AsDouble(value); + if ((double_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be float", keystr); + goto cleanup; + } + temp->value.d = double_val; + } + break; + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + if (PyBool_Check(value)) { + PyObject *hacktrue = PyBool_FromLong(1); + temp->value.b = hacktrue == value ? 1: 0; + Py_DECREF(hacktrue); + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be bool", keystr); + goto cleanup; + } + } + break; + case VIR_TYPED_PARAM_STRING: + { + char *string_val; + if (PyString_Check(value)) { + if ((string_val = PyString_AsString(value)) == NULL) + goto cleanup; + if ((temp->value.s = strdup(string_val)) == NULL) { + PyErr_NoMemory(); + goto cleanup; + } + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be string", keystr); + goto cleanup; + } + } + break; + default: + goto cleanup; + } + } + } + + if (i == nparams && !found) { + PyErr_Format(PyExc_LookupError, + "Attribute name \"%s\" could not be recognized", keystr); + goto cleanup; + } + + temp++; + } + return ret; + +cleanup: + virTypedParameterArrayClear(ret, size); + VIR_FREE(ret); + return NULL; +} + /************************************************************************ * * * Statistics * @@ -1007,6 +1265,131 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0, size = 0; + unsigned int flags; + virTypedParameterPtr params, new_params; + + if (!PyArg_ParseTuple(args, + (char *)"OOi:virDomainSetNumaParameters", + &pyobj_domain, &info, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0 || !nparams) + return VIR_PY_INT_FAIL; + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetNumaParameters(domain, new_params, size, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + virTypedParameterArrayClear(new_params, size); + VIR_FREE(new_params); + return ret; +} + +static PyObject * +libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetNumaParameters", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((info = PyDict_New()) == NULL) { + return ret; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if (!nparams) + return info; + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + i_retval = getPyVirTypedParameter(&info, params, nparams); + + if (i_retval < 0) { + Py_XDECREF(info); + goto cleanup; + } else if (i_retval == 0) { + Py_XDECREF(info); + ret = VIR_PY_NONE; + goto cleanup; + } else { + ret = info; + } + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5203,6 +5586,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlkioParameters", libvirt_virDomainGetBlkioParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetMemoryParameters", libvirt_virDomainSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.7.5

3 6

[libvirt] [PATCH] Remove single quotes from audit records
by Marcelo Cerri 10 Feb '12

10 Feb '12

Some audit records generated by libvirt contain fields enclosed by single quotes. Since those fields are inside the msg field, which is enclosed by single quotes, these records generated by libvirt are not correctly parsed by libauparse. --- src/conf/domain_audit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 7d766a2..934e546 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -175,7 +175,7 @@ virDomainAuditNet(virDomainObjPtr vm, } VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, - "virt=%s resrc=net reason=%s %s uuid=%s old-net='%s' new-net='%s'", + "virt=%s resrc=net reason=%s %s uuid=%s old-net=%s new-net=%s", virt, reason, vmname, uuidstr, oldDef ? oldMacstr : "?", newDef ? newMacstr : "?"); @@ -222,7 +222,7 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, } VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, - "virt=%s resrc=net reason=open %s uuid=%s net='%s' %s rdev=%s", + "virt=%s resrc=net reason=open %s uuid=%s net=%s %s rdev=%s", virt, vmname, uuidstr, macstr, dev_name, VIR_AUDIT_STR(rdev)); cleanup: -- 1.7.1

2 1

Re: [libvirt] [virt-tools-list] Provision through virt-manager not supported on para-virtualized Xen?
by Cole Robinson 09 Feb '12

09 Feb '12

On 02/02/2012 08:54 AM, Cheer Xiao wrote: > 2012/2/2 Cole Robinson <crobinso(a)redhat.com>: >> On 02/02/2012 08:05 AM, Cheer Xiao wrote: >>> Hi all, >>> >>> I was setting up libvirt and virt-manager for managing Xen VMs. But >>> when I hit "New" in virt-manager to provision a new VM, virt-manager >>> gives me the error: "No install options available for this >>> connection." >>> >>> The hypervisor being used is para-virtualized Xen, running on Debian Squeeze. >>> >>> lux-002# xm info >>> host Â Â Â Â Â Â Â Â Â : lux-002 >>> release Â Â Â Â Â Â Â Â : 2.6.32-5-xen-686 >>> version Â Â Â Â Â Â Â Â : #1 SMP Mon Jan 16 19:46:09 UTC 2012 >>> machine Â Â Â Â Â Â Â Â : i686 >>> nr_cpus Â Â Â Â Â Â Â Â : 4 >>> nr_nodes Â Â Â Â Â Â Â : 1 >>> cores_per_socket Â Â Â : 1 >>> threads_per_core Â Â Â : 2 >>> cpu_mhz Â Â Â Â Â Â Â Â : 3200 >>> hw_caps Â Â Â Â Â Â Â Â : >>> bfebfbff:20100000:00000000:00000180:0000641d:00000000:00000001:00000000 >>> virt_caps Â Â Â Â Â Â Â : >>> total_memory Â Â Â Â Â : 8191 >>> free_memory Â Â Â Â Â Â : 1150 >>> node_to_cpu Â Â Â Â Â Â : node0:0-3 >>> node_to_memory Â Â Â Â : node0:1150 >>> node_to_dma32_mem Â Â Â : node0:578 >>> max_node_id Â Â Â Â Â Â : 0 >>> xen_major Â Â Â Â Â Â Â : 4 >>> xen_minor Â Â Â Â Â Â Â : 0 >>> xen_extra Â Â Â Â Â Â Â : .1 >>> xen_caps Â Â Â Â Â Â Â : xen-3.0-x86_32p >>> xen_scheduler Â Â Â Â Â : credit >>> xen_pagesize Â Â Â Â Â : 4096 >>> platform_params Â Â Â Â : virt_start=0xf5800000 >>> xen_changeset Â Â Â Â Â : unavailable >>> xen_commandline Â Â Â Â : placeholder com1=9600,8n1 console=com1,vga >>> cc_compiler Â Â Â Â Â Â : gcc version 4.4.5 (Debian 4.4.5-8) >>> cc_compile_by Â Â Â Â Â : waldi >>> cc_compile_domain Â Â Â : debian.org >>> cc_compile_date Â Â Â Â : Mon Nov Â 7 09:18:26 CET 2011 >>> xend_config_format Â Â : 4 >>> lux-002# libvirtd --version >>> libvirtd (libvirt) 0.8.3 >>> >> >> libvirt pokes into the host machine to try and figure out it's virt >> capabilities. So something must be going wrong there. Here's the function it >> uses in libvirt code: >> >> http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/xen/xen_hypervisor.c;h=b… >> >> Something must be funky or unexpected with /sys/hypervisor/properties/capabilities >> > > This is how it looks: > > lux-002% cat /sys/hypervisor/properties/capabilities > xen-3.0-x86_32p > > So, is provision through on para-virtualized Xen *supposed* to be > supported or not? > That is saying your host supports 32bit paravirt guests only. What's the output of 'virsh --connect xen:/// capabilities' ? - Cole

2 10

[libvirt] Writing java wrappers to libvirt.java
by Dario Ruiz Lopez 09 Feb '12

09 Feb '12

Hello, I am trying to write a java wrapper that could allow to expand current libvirt support for java to intercept invocations to the driver so new functionality can be added, for instance, automatically sending an accounting log of all libvirt invocations to an external server. With the current implementation, the central point to do this seemed to be the interface libvirt.java, which defines an interface constant, INSTANCE, which is used all throughout the library to perform the invocations to the driver. My first idea was to create a wrapper for INSTANCE trying to replace it, but, as libvirt.java is an interface, INSTANCE cannot be reinitialized not overloaded. I might still try this by changing libvirt.java to an abstract class and INSTANCE to a static variable, but I do not think that changing the classes of the library is a good idea, especially for maintenance reasons. Does anybody know if there is any other way to define a wrapper for the invocations to the driver? Best regards, Darío Ruiz López ------------------------------------------------------------------ This e-mail and the documents attached are confidential and intended solely for the addressee; it may also be privileged. If you receive this e-mail in error, please notify the sender immediately and destroy it. As its integrity cannot be secured on the Internet, the Atos group liability cannot be triggered for the message content. Although the sender endeavours to maintain a computer virus-free network, the sender does not warrant that this transmission is virus-free and will not be liable for any damages resulting from any virus transmitted. Este mensaje y los ficheros adjuntos pueden contener informacion confidencial destinada solamente a la(s) persona(s) mencionadas anteriormente pueden estar protegidos por secreto profesional. Si usted recibe este correo electronico por error, gracias por informar inmediatamente al remitente y destruir el mensaje. Al no estar asegurada la integridad de este mensaje sobre la red, Atos no se hace responsable por su contenido. Su contenido no constituye ningun compromiso para el grupo Atos, salvo ratificacion escrita por ambas partes. Aunque se esfuerza al maximo por mantener su red libre de virus, el emisor no puede garantizar nada al respecto y no sera responsable de cualesquiera danos que puedan resultar de una transmision de virus. ------------------------------------------------------------------

1 0

[libvirt] RFC: API to report guest IP address(es)
by Michal Privoznik 09 Feb '12

09 Feb '12

Hi, Now we have qemu guest agent it is possible for us to: 1) extend guest agent to report IP addresses (not trivial among OSes). 2) Write API which will report these to mgmt application. One thing that I am not sure about and would like you to ask is: how should the API look like? In addition, we have this nwfilter which already learns host interfaces address (yeah, only one per interface). What scenarios are we facing here? 1) It is impossible (in general) to tie guest interface with the host interface because guest can change MAC address of any interface and this change is not propagated to the outside world. Therefore vnet1 can be eth0 or eth1 or even hello_i_am_funky_interface99. 2) Guest can create virtual interfaces within itself and therefore create a totally different structure than observed from outside, e.g. bonding. 3) Interface can have multiple addresses or even none. Therefore I lean to something like: int virDomainGetIPAddresses(virDomainPtr dom, char **addr[], int *addr_size); That is - simply return an array of IPs in string format (yes, allocated by us) and leave mgmt application to decide what to do with that. Any thoughts?

4 5

[libvirt] [PATCH] conf: small changes to comments in virDomainDeviceInfo
by Laine Stump 09 Feb '12

09 Feb '12

romfile wasn't mentioned in the comment, and the fact that rombar is now supported for network interfaces also wasn't there. Pushed under the trivial rule. --- src/conf/domain_conf.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0a2795d..8bb21cf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -167,10 +167,12 @@ struct _virDomainDeviceInfo { union { virDomainDeviceUSBMaster usb; } master; - /* rombar is only used for pci hostdev devices, and bootIndex only - * for disk, network interface, and hostdev devices */ + /* rombar and romfile are only used for pci hostdev and network + * devices. */ int rombar; /* enum virDomainPciRombarMode */ char *romfile; + /* bootIndex is only user for disk, network interface, and + * hostdev devices. */ int bootIndex; }; -- 1.7.7.6

1 0

[libvirt] [PATCH] python: Correct arguments number for migrateSetMaxSpeed
by Osier Yang 09 Feb '12

09 Feb '12

The API definition accepts "flags" argument, however, the implementation ignores it, though "flags" is unused currently, we should expose it instead of hard coding, the API implementation inside hypervisor driver is responsible to check if the passed "flags" is valid. --- python/libvirt-override.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 33a841d..2c6e7cf 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5062,14 +5062,16 @@ libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *a unsigned long bandwidth; virDomainPtr domain; PyObject *pyobj_domain; + unsigned int flags = 0; - if (!PyArg_ParseTuple(args, (char *)"O:virDomainMigrateGetMaxSpeed", &pyobj_domain)) + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainMigrateGetMaxSpeed", + &pyobj_domain, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virDomainMigrateGetMaxSpeed(domain, &bandwidth, 0); + c_retval = virDomainMigrateGetMaxSpeed(domain, &bandwidth, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) -- 1.7.7.3

2 2

[libvirt] [PATCH] docs: fix typo in python bindings
by Eric Blake 09 Feb '12

09 Feb '12

* docs/python.html.in: Class is virConnect, not virConn. --- Pushing this under the trivial rule. docs/python.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/python.html.in b/docs/python.html.in index a8c972e..e7538a4 100644 --- a/docs/python.html.in +++ b/docs/python.html.in @@ -20,7 +20,7 @@ lower case, for example the C functions: become - <code>virConn::numOfDomains(self)</code> + <code>virConnect::numOfDomains(self)</code> <code>virDomain::setMaxMemory(self, memory)</code> -- 1.7.7.6

1 0

[libvirt] [PATCH] cgroup:fix bug to keep --device-weights value persistent
by Guannan Ren 08 Feb '12

08 Feb '12

src/qemu/qemu_driver.c When run "virsh blkiotune dom --device-weights /dev/sda,400 --config" it couldn't be persistent after dom restart. The patch fix it. --- src/qemu/qemu_driver.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d66140b..1a53088 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5975,9 +5975,13 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *def, size_t *def_size, virReportOOMError(); return -1; } - (*def)[*def_size - 1].path = dw->path; + (*def)[*def_size - 1].path = strdup(dw->path); + if (!(*def)[*def_size - 1].path) { + virReportOOMError(); + return -1; + } + (*def)[*def_size - 1].weight = dw->weight; - dw->path = NULL; } } @@ -5985,6 +5989,46 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *def, size_t *def_size, } static int +qemuDomainiDefineDeviceWeights(virDomainDefPtr persistentDef, + virBlkioDeviceWeightPtr devices, size_t ndevices) +{ + int i; + virBlkioDeviceWeightPtr dw, result = NULL; + + if (!persistentDef->blkio.devices) { + if (VIR_ALLOC_N(result, ndevices) < 0) { + virReportOOMError(); + goto cleanup; + } + + for (i = 0; i < ndevices; i++) { + dw = &devices[i]; + result[i].path = strdup(dw->path); + if (!result[i].path) { + virReportOOMError(); + goto cleanup; + } + result[i].weight = dw->weight; + } + + persistentDef->blkio.devices = result; + } else { + if (qemuDomainMergeDeviceWeights(&persistentDef->blkio.devices, + &persistentDef->blkio.ndevices, + devices, ndevices) < 0) + return -1; + } + + persistentDef->blkio.ndevices = ndevices; + return 0; + +cleanup: + virBlkioDeviceWeightArrayClear(result, ndevices); + VIR_FREE(result); + return -1; +} + +static int qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -6116,6 +6160,11 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; continue; } + if (qemuDomainiDefineDeviceWeights(persistentDef, + devices, + ndevices) < 0) + ret = -1; + if (qemuDomainMergeDeviceWeights(&vm->def->blkio.devices, &vm->def->blkio.ndevices, devices, ndevices) < 0) -- 1.7.7.5

2 4

[libvirt] [PATCH] sysinfo: simplify function signature
by Eric Blake 08 Feb '12

08 Feb '12

Now that no one is relying on the return value being a pointer to somewhere inside of the passed-in argument, we can simplify the callers to simply return success or failure. Also wrap some long lines and add some const-correctness. * src/util/sysinfo.c (virSysinfoParseBIOS, virSysinfoParseSystem) (virSysinfoParseProcessor, virSysinfoParseMemory): Change return. (virSysinfoRead): Adjust caller. --- src/util/sysinfo.c | 104 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 43 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index 0e55d7e..39c7581 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -1,7 +1,7 @@ /* * sysinfo.c: get SMBIOS/sysinfo information from the host * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010 Daniel Veillard * * This library is free software; you can redistribute it and/or @@ -130,13 +130,13 @@ virSysinfoRead(void) { #else /* !WIN32 && x86 */ -static char * -virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseBIOS(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol = NULL; + const char *cur, *eol = NULL; if ((cur = strstr(base, "BIOS Information")) == NULL) - return base; + return 0; base = cur; if ((cur = strstr(base, "Vendor: ")) != NULL) { @@ -164,19 +164,19 @@ virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) goto no_memory; } - return base + strlen("BIOS Information"); + return 0; no_memory: - return NULL; + return -1; } -static char * -virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol = NULL; + const char *cur, *eol = NULL; if ((cur = strstr(base, "System Information")) == NULL) - return base; + return 0; base = cur; if ((cur = strstr(base, "Manufacturer: ")) != NULL) { @@ -223,16 +223,17 @@ virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) goto no_memory; } - return base + strlen("System Information"); + return 0; no_memory: - return NULL; + return -1; } -static char * -virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol, *tmp_base; + const char *cur, *tmp_base; + char *eol; virSysinfoProcessorDefPtr processor; while((tmp_base = strstr(base, "Processor Information")) != NULL) { @@ -249,7 +250,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_socket_destination = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_socket_destination + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type: ")) != NULL) { @@ -265,7 +267,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_family = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_family = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Manufacturer: ")) != NULL) { @@ -273,7 +276,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_manufacturer = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_manufacturer + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Signature: ")) != NULL) { @@ -281,7 +285,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_signature = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_signature + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Version: ")) != NULL) { @@ -289,7 +294,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_version = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "External Clock: ")) != NULL) { @@ -297,7 +303,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_external_clock = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_external_clock + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Max Speed: ")) != NULL) { @@ -305,7 +312,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_max_speed = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_max_speed + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Status: ")) != NULL) { @@ -313,7 +321,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_status = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_status = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { @@ -321,7 +330,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_serial_number + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Part Number: ")) != NULL) { @@ -329,23 +339,25 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_part_number = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_part_number + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } base += strlen("Processor Information"); } - return base; + return 0; no_memory: - return NULL; + return -1; } -static char * -virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol, *tmp_base; + const char *cur, *tmp_base; + char *eol; virSysinfoMemoryDefPtr memory; while ((tmp_base = strstr(base, "Memory Device")) != NULL) { @@ -373,7 +385,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_form_factor = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_form_factor = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Locator: ")) != NULL) { @@ -389,7 +402,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_bank_locator = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_bank_locator = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type: ")) != NULL) { @@ -405,7 +419,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_type_detail = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_type_detail = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Speed: ")) != NULL) { @@ -421,7 +436,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_manufacturer = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_manufacturer = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { @@ -429,7 +445,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_serial_number = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_serial_number = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Part Number: ")) != NULL) { @@ -437,7 +454,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_part_number = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_part_number = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } @@ -445,10 +463,10 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) base += strlen("Memory Device"); } - return base; + return 0; no_memory: - return NULL; + return -1; } virSysinfoDefPtr @@ -481,20 +499,20 @@ virSysinfoRead(void) { ret->type = VIR_SYSINFO_SMBIOS; - if ((virSysinfoParseBIOS(outbuf, ret)) == NULL) + if (virSysinfoParseBIOS(outbuf, ret) < 0) goto no_memory; - if ((virSysinfoParseSystem(outbuf, ret)) == NULL) + if (virSysinfoParseSystem(outbuf, ret) < 0) goto no_memory; ret->nprocessor = 0; ret->processor = NULL; - if ((virSysinfoParseProcessor(outbuf, ret)) == NULL) + if (virSysinfoParseProcessor(outbuf, ret) < 0) goto no_memory; ret->nmemory = 0; ret->memory = NULL; - if (virSysinfoParseMemory(outbuf, ret) == NULL) + if (virSysinfoParseMemory(outbuf, ret) < 0) goto no_memory; cleanup: -- 1.7.7.6

2 2