6:59 a.m.
v1 here:
http://www.redhat.com/archives/libvir-list/2015-February/msg00684.html
Changes in v2:
* Return an empty list when there are no IOThreads found
* Fix alloc/cleanup logic to match review comments
* Used "PyObject *error = NULL" like the GetCPUStats code in order to
return either NULL for Py*_New() and PyTuple_SetItem() method errors
or VIR_PY_NONE for other exceptions
* Only make the Py_XDECREF calls on objects which don't get consumed by
PyTuple_SetItem
* Change name of method from "getIOThreadsInfo" to "ioThreadsInfo"
John Ferlan (2):
Support virDomainGetIOThreadsInfo and virDomainIOThreadsInfoFree
Support virDomainSetIOThreads
generator.py | 6 ++
libvirt-override-api.xml | 14 ++++
libvirt-override.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++
sanitytest.py | 5 ++
4 files changed, 205 insertions(+)
--
2.1.0
6:59 a.m.
New subject: [libvirt] [PATCH v2 1/2] Support virDomainGetIOThreadsInfo and virDomainIOThreadsInfoFree
Add support for the libvirt_virDomainGetIOThreadsInfo method. This
code mostly follows the libvirt_virDomainGetVcpuPinInfo method, but
also takes some from the libvirt_virNodeGetCPUMap method with respect
to building the cpumap into the returned tuple rather than two separate
tuples which vcpu pinning generates
Assuming two domains, one with IOThreads defined (eg, 'iothr-gst') and
one without ('noiothr-gst'), execute the following in an 'iothr.py' file:
import libvirt
con=libvirt.open("qemu:///system")
dom=con.lookupByName('iothr-gst')
print dom.ioThreadsInfo()
dom2=con.lookupByName('noiothr-gst')
print dom2.ioThreadsInfo()
$ python iothr.py
[(1, [False, False, True, False], ['/home/vm-images/iothr-vol1']), (2, [False,
False, False, True], ['/home/vm-images/iothr-vol2']), (3, [True, False, False,
False], [])]
[]
$
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
generator.py | 5 +++
libvirt-override-api.xml | 6 +++
libvirt-override.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++
sanitytest.py | 5 +++
4 files changed, 130 insertions(+)
diff --git a/generator.py b/generator.py
index 0d48980..8165a18 100755
--- a/generator.py
+++ b/generator.py
@@ -435,6 +435,7 @@ skip_impl = (
'virDomainGetVcpuPinInfo',
'virDomainGetEmulatorPinInfo',
'virDomainPinEmulator',
+ 'virDomainGetIOThreadsInfo',
'virSecretGetValue',
'virSecretSetValue',
'virSecretGetUUID',
@@ -592,6 +593,7 @@ skip_function = (
'virNetworkDHCPLeaseFree', # only useful in C, python code uses list
'virDomainStatsRecordListFree', # only useful in C, python uses dict
'virDomainFSInfoFree', # only useful in C, python code uses list
+ 'virDomainIOThreadsInfoFree', # only useful in C, python code uses list
)
lxc_skip_function = (
@@ -1144,6 +1146,9 @@ def nameFixup(name, classe, type, file):
elif name[0:20] == "virDomainGetCPUStats":
func = name[9:]
func = func[0:1].lower() + func[1:]
+ elif name[0:25] == "virDomainGetIOThreadsInfo":
+ func = name[12:]
+ func = func[0:2].lower() + func[2:]
elif name[0:18] == "virDomainGetFSInfo":
func = name[12:]
func = func[0:2].lower() + func[2:]
diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml
index 439cb40..e512311 100644
--- a/libvirt-override-api.xml
+++ b/libvirt-override-api.xml
@@ -278,6 +278,12 @@
<arg name='cpumap' type='unsigned char *' info='pointer to a
bit map of real CPUs (in 8-bit bytes) (IN) Each bit set to 1 means that corresponding CPU
is usable. Bytes are stored in little-endian order: CPU0-7, 8-15... In each byte, lowest
CPU number is least significant bit.'/>
<arg name='flags' type='int' info='flags to
specify'/>
</function>
+ <function name='virDomainGetIOThreadsInfo' file='python'>
+ <info>Query the CPU affinity setting of the IOThreads of the
domain</info>
+ <arg name='domain' type='virDomainPtr' info='pointer to
domain object, or NULL for Domain0'/>
+ <arg name='flags' type='int' info='an OR'ed set of
virDomainModificationImpact'/>
+ <return type='char *' info="list of IOThreads information including
the iothread_id, the cpumap, the cpumap length, number of associated resources, and a list
of each resource assigned to the iothread_id."/>
+ </function>
<function name='virDomainSetSchedulerParameters'
file='python'>
<info>Change the scheduler parameters</info>
<return type='int' info='-1 in case of error, 0 in case of
success.'/>
diff --git a/libvirt-override.c b/libvirt-override.c
index 88cb527..580a1b2 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -1990,6 +1990,117 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self
ATTRIBUTE_UNUSED,
}
#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */
+#if LIBVIR_CHECK_VERSION(1, 2, 13)
+static PyObject *
+libvirt_virDomainGetIOThreadsInfo(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args) {
+ virDomainPtr domain;
+ PyObject *pyobj_domain;
+ PyObject *py_retval = NULL;
+ PyObject *error = NULL;
+ virDomainIOThreadsInfoPtr *iothrinfo = NULL;
+ unsigned int flags;
+ size_t pcpu, i, j;
+ int niothreads, cpunum;
+
+ if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetIOThreadsInfo",
+ &pyobj_domain, &flags))
+ return NULL;
+ domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
+
+ if ((cpunum = getPyNodeCPUCount(virDomainGetConnect(domain))) < 0)
+ return VIR_PY_NONE;
+
+ LIBVIRT_BEGIN_ALLOW_THREADS;
+ niothreads = virDomainGetIOThreadsInfo(domain, &iothrinfo, flags);
+ LIBVIRT_END_ALLOW_THREADS;
+
+ if (niothreads < 0) {
+ error = VIR_PY_NONE;
+ goto cleanup;
+ }
+
+ /* convert to a Python list */
+ if ((py_retval = PyList_New(niothreads)) == NULL)
+ goto cleanup;
+
+ /* NOTE: If there are zero IOThreads we will return an empty list */
+ for (i = 0; i < niothreads; i++) {
+ PyObject *iothrtpl = NULL;
+ PyObject *iothrid = NULL;
+ PyObject *iothrmap = NULL;
+ PyObject *resources = NULL;
+ virDomainIOThreadsInfoPtr iothr = iothrinfo[i];
+
+ if (iothr == NULL) {
+ error = VIR_PY_NONE;
+ goto cleanup;
+ }
+
+ if ((iothrtpl = PyTuple_New(3)) == NULL ||
+ PyList_SetItem(py_retval, i, iothrtpl) < 0) {
+ Py_XDECREF(iothrtpl);
+ goto cleanup;
+ }
+
+ /* 0: IOThread ID */
+ if ((iothrid = libvirt_uintWrap(iothr->iothread_id)) == NULL ||
+ PyTuple_SetItem(iothrtpl, 0, iothrid) < 0) {
+ Py_XDECREF(iothrid);
+ goto cleanup;
+ }
+
+ /* 1: CPU map */
+ if ((iothrmap = PyList_New(cpunum)) == NULL ||
+ PyTuple_SetItem(iothrtpl, 1, iothrmap) < 0) {
+ Py_XDECREF(iothrmap);
+ goto cleanup;
+ }
+ for (pcpu = 0; pcpu < cpunum; pcpu++) {
+ PyObject *pyused;
+ if ((pyused = PyBool_FromLong(VIR_CPU_USED(iothr->cpumap,
+ pcpu))) == NULL) {
+ error = VIR_PY_NONE;
+ goto cleanup;
+ }
+ if (PyList_SetItem(iothrmap, pcpu, pyused) < 0) {
+ Py_XDECREF(pyused);
+ goto cleanup;
+ }
+ }
+
+ /* 2: Resources - may be empty */
+ if ((resources = PyList_New(0)) == NULL ||
+ PyTuple_SetItem(iothrtpl, 2, resources) < 0) {
+ Py_XDECREF(resources);
+ goto cleanup;
+ }
+ for (j = 0; j < iothr->nresources; j++) {
+ PyObject *resrc = NULL;
+ if ((resrc = libvirt_constcharPtrWrap(iothr->resources[j])) == NULL)
+ goto cleanup;
+ if (PyList_Append(resources, resrc) < 0) {
+ error = VIR_PY_NONE;
+ goto cleanup;
+ }
+ }
+ }
+
+ for (i = 0; i < niothreads; i++)
+ virDomainIOThreadsInfoFree(iothrinfo[i]);
+ VIR_FREE(iothrinfo);
+
+ return py_retval;
+
+cleanup:
+ for (i = 0; i < niothreads; i++)
+ virDomainIOThreadsInfoFree(iothrinfo[i]);
+ VIR_FREE(iothrinfo);
+ Py_XDECREF(py_retval);
+ return error;
+}
+
+#endif /* LIBVIR_CHECK_VERSION(1, 2, 13) */
/************************************************************************
* *
@@ -8483,6 +8594,9 @@ static PyMethodDef libvirtMethods[] = {
{(char *) "virDomainGetEmulatorPinInfo",
libvirt_virDomainGetEmulatorPinInfo, METH_VARARGS, NULL},
{(char *) "virDomainPinEmulator", libvirt_virDomainPinEmulator,
METH_VARARGS, NULL},
#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */
+#if LIBVIR_CHECK_VERSION(1, 2, 13)
+ {(char *) "virDomainGetIOThreadsInfo", libvirt_virDomainGetIOThreadsInfo,
METH_VARARGS, NULL},
+#endif /* LIBVIR_CHECK_VERSION(1, 2, 13) */
{(char *) "virConnectListStoragePools", libvirt_virConnectListStoragePools,
METH_VARARGS, NULL},
{(char *) "virConnectListDefinedStoragePools",
libvirt_virConnectListDefinedStoragePools, METH_VARARGS, NULL},
#if LIBVIR_CHECK_VERSION(0, 10, 2)
diff --git a/sanitytest.py b/sanitytest.py
index f021e5a..0e6e0e5 100644
--- a/sanitytest.py
+++ b/sanitytest.py
@@ -142,6 +142,9 @@ for cname in wantfunctions:
if name[0:19] == "virDomainFSInfoFree":
continue
+ if name[0:26] == "virDomainIOThreadsInfoFree":
+ continue
+
if name[0:21] == "virDomainListGetStats":
name = "virConnectDomainListGetStats"
@@ -276,6 +279,8 @@ for name in sorted(basicklassmap):
func = "nwfilter" + func[8:]
if func[0:8] == "fSFreeze" or func[0:6] == "fSThaw" or func[0:6]
== "fSInfo":
func = "fs" + func[2:]
+ if func[0:13] == "iOThreadsInfo":
+ func = "ioThreadsInfo"
if klass == "virNetwork":
func = func.replace("dHCP", "DHCP")
--
2.1.0
7 a.m.
New subject: [libvirt] [PATCH v2 2/2] Support virDomainSetIOThreads
Support the libvirt_virDomainSetIOThreads method using code that mimics
the existing libvirt_virDomainPinVcpuFlags method
The following is a sample session assuming guest 'iothr-gst' has IOThreads
configured (it's currently running, too)
>> import libvirt
>> con=libvirt.open("qemu:///system")
>> dom=con.lookupByName('iothr-gst')
>> dom.ioThreadsInfo()
[(1, [False, False, True, False],
['/home/vm-images/iothr-vol1']), (2, [False, False, False, True],
['/home/vm-images/iothr-vol2']), (3, [False, False, False, True], [])]
>> cpumap=(True,True,True,False)
>> dom.setIOThreads(3,cpumap)
0
>> print dom.ioThreadsInfo()
[(1, [False, False, True,
False], ['/home/vm-images/iothr-vol1']), (2, [False, False, False, True],
['/home/vm-images/iothr-vol2']), (3, [True, True, True, False], [])]
>>
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
generator.py | 1 +
libvirt-override-api.xml | 8 ++++++
libvirt-override.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/generator.py b/generator.py
index 8165a18..aa140ed 100755
--- a/generator.py
+++ b/generator.py
@@ -436,6 +436,7 @@ skip_impl = (
'virDomainGetEmulatorPinInfo',
'virDomainPinEmulator',
'virDomainGetIOThreadsInfo',
+ 'virDomainSetIOThreads',
'virSecretGetValue',
'virSecretSetValue',
'virSecretGetUUID',
diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml
index e512311..19667b6 100644
--- a/libvirt-override-api.xml
+++ b/libvirt-override-api.xml
@@ -284,6 +284,14 @@
<arg name='flags' type='int' info='an OR'ed set of
virDomainModificationImpact'/>
<return type='char *' info="list of IOThreads information including
the iothread_id, the cpumap, the cpumap length, number of associated resources, and a list
of each resource assigned to the iothread_id."/>
</function>
+ <function name='virDomainSetIOThreads' file='python'>
+ <info>Dynamically change the real CPUs which can be allocated to an IOThread.
This function requires privileged access to the hypervisor.</info>
+ <return type='int' info='0 in case of success, -1 in case of
failure.'/>
+ <arg name='domain' type='virDomainPtr' info='pointer to
domain object'/>
+ <arg name='iothread_val' type='unsigned int'
info='iothread_id number'/>
+ <arg name='cpumap' type='unsigned char *' info='pointer to a
bit map of real CPUs (in 8-bit bytes) (IN) Each bit set to 1 means that corresponding CPU
is usable. Bytes are stored in little-endian order: CPU0-7, 8-15... In each byte, lowest
CPU number is least significant bit.'/>
+ <arg name='flags' type='int' info='an OR'ed set of
virDomainIOThreadsFlags'/>
+ </function>
<function name='virDomainSetSchedulerParameters'
file='python'>
<info>Change the scheduler parameters</info>
<return type='int' info='-1 in case of error, 0 in case of
success.'/>
diff --git a/libvirt-override.c b/libvirt-override.c
index 580a1b2..8823a39 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -2100,6 +2100,71 @@ cleanup:
return error;
}
+static PyObject *
+libvirt_virDomainSetIOThreads(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args)
+{
+ virDomainPtr domain;
+ PyObject *pyobj_domain, *pycpumap;
+ PyObject *ret = NULL;
+ unsigned char *cpumap;
+ int cpumaplen, iothread_val, tuple_size, cpunum;
+ size_t i;
+ unsigned int flags;
+ int i_retval;
+
+ if (!PyArg_ParseTuple(args, (char *)"OiOI:virDomainSetIOThread",
+ &pyobj_domain, &iothread_val, &pycpumap,
&flags))
+ return NULL;
+ domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
+
+ if ((cpunum = getPyNodeCPUCount(virDomainGetConnect(domain))) < 0)
+ return VIR_PY_INT_FAIL;
+
+ if (PyTuple_Check(pycpumap)) {
+ if ((tuple_size = PyTuple_Size(pycpumap)) == -1)
+ return ret;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required");
+ return ret;
+ }
+
+ cpumaplen = VIR_CPU_MAPLEN(cpunum);
+ if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
+ return PyErr_NoMemory();
+
+ for (i = 0; i < tuple_size; i++) {
+ PyObject *flag = PyTuple_GetItem(pycpumap, i);
+ bool b;
+
+ if (!flag || libvirt_boolUnwrap(flag, &b) < 0)
+ goto cleanup;
+
+ if (b)
+ VIR_USE_CPU(cpumap, i);
+ else
+ VIR_UNUSE_CPU(cpumap, i);
+ }
+
+ for (; i < cpunum; i++)
+ VIR_UNUSE_CPU(cpumap, i);
+
+ flags |= VIR_DOMAIN_IOTHREADS_PIN;
+ LIBVIRT_BEGIN_ALLOW_THREADS;
+ i_retval = virDomainSetIOThreads(domain, iothread_val,
+ cpumap, cpumaplen, flags);
+ LIBVIRT_END_ALLOW_THREADS;
+ if (i_retval < 0) {
+ ret = VIR_PY_INT_FAIL;
+ goto cleanup;
+ }
+ ret = VIR_PY_INT_SUCCESS;
+
+cleanup:
+ VIR_FREE(cpumap);
+ return ret;
+}
+
#endif /* LIBVIR_CHECK_VERSION(1, 2, 13) */
/************************************************************************
@@ -8596,6 +8661,7 @@ static PyMethodDef libvirtMethods[] = {
#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */
#if LIBVIR_CHECK_VERSION(1, 2, 13)
{(char *) "virDomainGetIOThreadsInfo", libvirt_virDomainGetIOThreadsInfo,
METH_VARARGS, NULL},
+ {(char *) "virDomainSetIOThreads", libvirt_virDomainSetIOThreads,
METH_VARARGS, NULL},
#endif /* LIBVIR_CHECK_VERSION(1, 2, 13) */
{(char *) "virConnectListStoragePools", libvirt_virConnectListStoragePools,
METH_VARARGS, NULL},
{(char *) "virConnectListDefinedStoragePools",
libvirt_virConnectListDefinedStoragePools, METH_VARARGS, NULL},
--
2.1.0
3594
days inactive
3594
days old
2 comments
1 participants
participants (1)
-
John Ferlan