[libvirt] [libvirt-python PATCH 2/2] Rename virDomainGetIOThreadsInfo to virDomainGetIOThreadInfo

Jiri Denemark jdenemar at redhat.com
Thu Mar 26 19:36:34 UTC 2015


On Thu, Mar 26, 2015 at 11:37:28 -0400, John Ferlan wrote:
> 
> 
> On 03/26/2015 08:43 AM, Ján Tomko wrote:
> > ---
> >  generator.py             |  4 ++--
> >  libvirt-override-api.xml |  2 +-
> >  libvirt-override.c       | 10 +++++-----
> >  sanitytest.py            |  4 ++--
> >  4 files changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/generator.py b/generator.py
> > index 05ccbc8..729daa2 100755
> > --- a/generator.py
> > +++ b/generator.py
> > @@ -435,7 +435,7 @@ skip_impl = (
> >      'virDomainGetVcpuPinInfo',
> >      'virDomainGetEmulatorPinInfo',
> >      'virDomainPinEmulator',
> > -    'virDomainGetIOThreadsInfo',
> > +    'virDomainGetIOThreadInfo',
> >      'virDomainPinIOThread',
> >      'virSecretGetValue',
> >      'virSecretSetValue',
> > @@ -1147,7 +1147,7 @@ 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":
> > +    elif name[0:24] == "virDomainGetIOThreadInfo":
> >          func = name[12:]
> >          func = func[0:2].lower() + func[2:]
> >      elif name[0:18] == "virDomainGetFSInfo":
> > diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml
> > index 4660c9f..cf46090 100644
> > --- a/libvirt-override-api.xml
> > +++ b/libvirt-override-api.xml
> > @@ -278,7 +278,7 @@
> >        <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'>
> > +    <function name='virDomainGetIOThreadInfo' 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'/>
> > diff --git a/libvirt-override.c b/libvirt-override.c
> > index 9a72f87..0699ae3 100644
> > --- a/libvirt-override.c
> > +++ b/libvirt-override.c
> > @@ -1992,8 +1992,8 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED,
> >  
> >  #if LIBVIR_CHECK_VERSION(1, 2, 14)
> >  static PyObject *
> > -libvirt_virDomainGetIOThreadsInfo(PyObject *self ATTRIBUTE_UNUSED,
> > -                                  PyObject *args)
> > +libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED,
> > +                                 PyObject *args)
> >  {
> >      virDomainPtr domain;
> >      PyObject *pyobj_domain;
> > @@ -2004,7 +2004,7 @@ libvirt_virDomainGetIOThreadsInfo(PyObject *self ATTRIBUTE_UNUSED,
> >      size_t pcpu, i;
> >      int niothreads, cpunum;
> >  
> > -    if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetIOThreadsInfo",
> > +    if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetIOThreadInfo",
> >                            &pyobj_domain, &flags))
> >          return NULL;
> >      domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
> > @@ -2013,7 +2013,7 @@ libvirt_virDomainGetIOThreadsInfo(PyObject *self ATTRIBUTE_UNUSED,
> >          return VIR_PY_NONE;
> >  
> >      LIBVIRT_BEGIN_ALLOW_THREADS;
> > -    niothreads = virDomainGetIOThreadsInfo(domain, &iothrinfo, flags);
> > +    niothreads = virDomainGetIOThreadInfo(domain, &iothrinfo, flags);
> >      LIBVIRT_END_ALLOW_THREADS;
> >  
> >      if (niothreads < 0) {
> 
> If you've added the CPU Time it needs to be handled here too
> 
> John
> > @@ -8640,7 +8640,7 @@ static PyMethodDef libvirtMethods[] = {
> >      {(char *) "virDomainPinEmulator", libvirt_virDomainPinEmulator, METH_VARARGS, NULL},
> >  #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */
> >  #if LIBVIR_CHECK_VERSION(1, 2, 14)
> > -    {(char *) "virDomainGetIOThreadsInfo", libvirt_virDomainGetIOThreadsInfo, METH_VARARGS, NULL},
> > +    {(char *) "virDomainGetIOThreadInfo", libvirt_virDomainGetIOThreadInfo, METH_VARARGS, NULL},
> >      {(char *) "virDomainPinIOThread", libvirt_virDomainPinIOThread, METH_VARARGS, NULL},
> >  #endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */
> >      {(char *) "virConnectListStoragePools", libvirt_virConnectListStoragePools, METH_VARARGS, NULL},
> > diff --git a/sanitytest.py b/sanitytest.py
> > index cff9811..aafc487 100644
> > --- a/sanitytest.py
> > +++ b/sanitytest.py
> > @@ -279,8 +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 func[0:13] == "iOThreadInfo":
> 
> s/13/12

Actually, why don't we use something like
func.startswith("iOThreadInfo") everywhere instead of this fragile [0:n]
approach? Are we targeting some old versions of python which did not
support that (I don't know if such versions even exist, though)?

Jirka




More information about the libvir-list mailing list