8:56 p.m.
Pavel Hrdina (4):
libvirt-override: all flags should be defined as unsigned int
libvirt-override: fix PyArg_ParseTuple for unsigned int
libvirt-override: fix PyArg_ParseTuple for unsigned long long
libvirt-override: fix PyArg_ParseTuple for size_t
libvirt-override.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
--
2.7.1
8:56 p.m.
New subject: [libvirt] [python PATCH 1/4] libvirt-override: all flags should be defined as unsigned int
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
libvirt-override.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libvirt-override.c b/libvirt-override.c
index a8c019b..0e14d7b 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -2148,7 +2148,7 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED,
PyObject *rv = NULL, *pyobj_conn;
char **models = NULL;
size_t i;
- int flags = 0;
+ unsigned int flags = 0;
const char *arch = NULL;
if (!PyArg_ParseTuple(args, (char *)"OsI:virConnectGetCPUModelNames",
--
2.7.1
8:56 p.m.
New subject: [libvirt] [python PATCH 2/4] libvirt-override: fix PyArg_ParseTuple for unsigned int
Format string uses 'i' for int type and 'I' for unsigned int type.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
libvirt-override.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libvirt-override.c b/libvirt-override.c
index 0e14d7b..d6c8c13 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -1149,7 +1149,7 @@ libvirt_virDomainGetInterfaceParameters(PyObject *self
ATTRIBUTE_UNUSED,
const char *device = NULL;
virTypedParameterPtr params;
- if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetInterfaceParameters",
+ if (!PyArg_ParseTuple(args, (char *)"OzI:virDomainGetInterfaceParameters",
&pyobj_domain, &device, &flags))
return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
@@ -4988,7 +4988,7 @@ libvirt_virDomainInterfaceAddresses(PyObject *self
ATTRIBUTE_UNUSED,
int ifaces_count = 0;
size_t i, j;
- if (!PyArg_ParseTuple(args, (char *) "Oii:virDomainInterfaceAddresses",
+ if (!PyArg_ParseTuple(args, (char *) "OII:virDomainInterfaceAddresses",
&pyobj_domain, &source, &flags))
return NULL;
@@ -7389,7 +7389,7 @@ libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED,
unsigned int keycodes[VIR_DOMAIN_SEND_KEY_MAX_KEYS];
unsigned int nkeycodes;
- if (!PyArg_ParseTuple(args, (char *)"OiiOiI:virDomainSendKey",
+ if (!PyArg_ParseTuple(args, (char *)"OiiOII:virDomainSendKey",
&pyobj_domain, &codeset, &holdtime,
&pyobj_list,
&nkeycodes, &flags))
return NULL;
@@ -8100,7 +8100,7 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED,
int c_retval;
ssize_t pyobj_pagesize_size, i, j;
- if (!PyArg_ParseTuple(args, (char *)"OOiiI:virNodeGetFreePages",
+ if (!PyArg_ParseTuple(args, (char *)"OOiII:virNodeGetFreePages",
&pyobj_conn, &pyobj_pagesize, &startCell,
&cellCount, &flags))
return NULL;
@@ -8421,7 +8421,7 @@ libvirt_virNodeAllocPages(PyObject *self ATTRIBUTE_UNUSED,
unsigned int flags = VIR_NODE_ALLOC_PAGES_ADD;
int c_retval;
- if (!PyArg_ParseTuple(args, (char *)"OOiiI:virNodeAllocPages",
+ if (!PyArg_ParseTuple(args, (char *)"OOiII:virNodeAllocPages",
&pyobj_conn, &pyobj_pages,
&startCell, &cellCount, &flags))
return NULL;
@@ -8480,7 +8480,7 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED,
size_t j;
PyObject *py_retval = NULL;
- if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainFSInfo",
+ if (!PyArg_ParseTuple(args, (char *)"OI:virDomainFSInfo",
&pyobj_domain, &flags))
return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
--
2.7.1
8:56 p.m.
New subject: [libvirt] [python PATCH 3/4] libvirt-override: fix PyArg_ParseTuple for unsigned long long
Format string uses 'L' for long long type and 'K' for unsigned long long
type.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1260356
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
libvirt-override.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libvirt-override.c b/libvirt-override.c
index d6c8c13..e99e8ff 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -7552,7 +7552,7 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED,
char *buf;
unsigned int flags;
- if (!PyArg_ParseTuple(args, (char *)"OzLnI:virDomainBlockPeek",
+ if (!PyArg_ParseTuple(args, (char *)"OzKnI:virDomainBlockPeek",
&pyobj_domain, &disk, &offset, &size,
&flags))
return NULL;
@@ -7590,7 +7590,7 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED,
char *buf;
unsigned int flags;
- if (!PyArg_ParseTuple(args, (char *)"OLnI:virDomainMemoryPeek",
+ if (!PyArg_ParseTuple(args, (char *)"OKnI:virDomainMemoryPeek",
&pyobj_domain, &start, &size, &flags))
return NULL;
--
2.7.1
8:56 p.m.
New subject: [libvirt] [python PATCH 4/4] libvirt-override: fix PyArg_ParseTuple for size_t
Format string uses 'n' for Py_ssize_t but size_t is unsigned long, we
need to use 'k'.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
libvirt-override.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libvirt-override.c b/libvirt-override.c
index e99e8ff..2308802 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -7552,7 +7552,7 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED,
char *buf;
unsigned int flags;
- if (!PyArg_ParseTuple(args, (char *)"OzKnI:virDomainBlockPeek",
+ if (!PyArg_ParseTuple(args, (char *)"OzKkI:virDomainBlockPeek",
&pyobj_domain, &disk, &offset, &size,
&flags))
return NULL;
@@ -7590,7 +7590,7 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED,
char *buf;
unsigned int flags;
- if (!PyArg_ParseTuple(args, (char *)"OKnI:virDomainMemoryPeek",
+ if (!PyArg_ParseTuple(args, (char *)"OKkI:virDomainMemoryPeek",
&pyobj_domain, &start, &size, &flags))
return NULL;
--
2.7.1
11:44 p.m.
On 23.02.2016 13:56, Pavel Hrdina wrote:
Pavel Hrdina (4):
libvirt-override: all flags should be defined as unsigned int
libvirt-override: fix PyArg_ParseTuple for unsigned int
libvirt-override: fix PyArg_ParseTuple for unsigned long long
libvirt-override: fix PyArg_ParseTuple for size_t
libvirt-override.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
ACK and safe for the freeze.
Michal
3117
days inactive
3119
days old
5 comments
2 participants
participants (2)
-
Michal Privoznik -
Pavel Hrdina