shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-08-01 00:21:59 +03:00
Code Issues Projects Releases Activity

Add dict check for setTime and allow pass 'seconds' parameter

Browse Source 
When pass None or a empty dictionary to time, it will report
error. This commit allows a one-element dictionary which contains
just 'seconds' field, which results in the same as passing 0 for
'nseconds' field. Moreover, dict is checked for unknown fields.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Luyao Huang
2014-10-31 10:02:16 +08:00
committed by Michal Privoznik
parent 8dcdc7f2b4
commit 3d1d3fd52a
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libvirt-override-virDomain.py
View File

@ -67,8 +67,8 @@
return ret
def setTime(self, time=None, flags=0):
"""Set guest time to the given value. @time is a dict conatining
'seconds' field for seconds and 'nseconds' field for nanosecons """
"""Set guest time to the given value. @time is a dict containing
'seconds' field for seconds and 'nseconds' field for nanoseconds """
ret = libvirtmod.virDomainSetTime(self._o, time, flags)
if ret == -1: raise libvirtError ('virDomainSetTime() failed', dom=self)
return ret

37
libvirt-override.c
View File

@ -7785,12 +7785,14 @@ static PyObject *
libvirt_virDomainSetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyObject *py_retval = NULL;
PyObject *pyobj_domain;
PyObject *pyobj_seconds;
PyObject *pyobj_nseconds;
PyObject *py_dict;
virDomainPtr domain;
long long seconds = 0;
unsigned int nseconds = 0;
unsigned int flags;
ssize_t py_dict_size;
ssize_t py_dict_size = 0;
int c_retval;
if (!PyArg_ParseTuple(args, (char*)"OOI:virDomainSetTime",
@ -7798,25 +7800,30 @@ libvirt_virDomainSetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return NULL;
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
py_dict_size = PyDict_Size(py_dict);
if (py_dict_size == 2) {
PyObject *pyobj_seconds, *pyobj_nseconds;
if (!(pyobj_seconds = PyDict_GetItemString(py_dict, "seconds")) ||
(libvirt_longlongUnwrap(pyobj_seconds, &seconds) < 0)) {
PyErr_Format(PyExc_LookupError, "malformed or missing 'seconds'");
if (PyDict_Check(py_dict)) {
py_dict_size = PyDict_Size(py_dict);
if ((pyobj_seconds = PyDict_GetItemString(py_dict, "seconds"))) {
if (libvirt_longlongUnwrap(pyobj_seconds, &seconds) < 0) {
PyErr_Format(PyExc_LookupError, "malformed 'seconds'");
goto cleanup;
}
} else {
PyErr_Format(PyExc_LookupError, "Dictionary must contains 'seconds'");
goto cleanup;
}
if (!(pyobj_nseconds = PyDict_GetItemString(py_dict, "nseconds")) ||
(libvirt_uintUnwrap(pyobj_nseconds, &nseconds) < 0)) {
PyErr_Format(PyExc_LookupError, "malformed or missing 'nseconds'");
if ((pyobj_nseconds = PyDict_GetItemString(py_dict, "nseconds"))) {
if (libvirt_uintUnwrap(pyobj_nseconds, &nseconds) < 0) {
PyErr_Format(PyExc_LookupError, "malformed 'nseconds'");
goto cleanup;
}
} else if (py_dict_size > 1) {
PyErr_Format(PyExc_LookupError, "Dictionary contains unknown key");
goto cleanup;
}
} else if (py_dict_size > 0) {
PyErr_Format(PyExc_LookupError, "Dictionary must contain "
"'seconds' and 'nseconds'");
} else if (py_dict != Py_None || !flags) {
PyErr_Format(PyExc_TypeError, "time must be a dictionary "
"or None with flags set");
goto cleanup;
}