[libvirt] [PATCH python v2] Fix handling of optional params in blockCopy()
Nir Soffer
nsoffer at redhat.com
Mon Mar 11 21:37:25 UTC 2019
On Mon, Mar 11, 2019 at 11:35 PM Nir Soffer <nirsof at gmail.com> wrote:
> Commit 2b4bd07e0a22 (Add check for params, nparams being a dictionary)
> changed the way the optional params argument is treated. If
> libvirt.virDomain.blockCopy() is called without specifying params,
> params is None, and the call will fail with:
>
> TypeError: block params must be a dictionary
>
> This is wrong as params is defined as kwarg, breaking existing libvirt
> users like oVirt. Add a check for Py_None, so we accept either a dict or
> None and fail with TypeError with anything else.
>
> Resolves: https://bugzilla.redhat.com/1687114
>
> Signed-off-by: Nir Soffer <nsoffer at redhat.com>
> ---
> libvirt-override.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libvirt-override.c b/libvirt-override.c
> index 857c018..c5e2908 100644
> --- a/libvirt-override.c
> +++ b/libvirt-override.c
> @@ -8835,11 +8835,11 @@ libvirt_virDomainBlockCopy(PyObject *self
> ATTRIBUTE_UNUSED,
> if (virPyDictToTypedParams(pyobj_dict, ¶ms, &nparams,
> virPyDomainBlockCopyParams,
>
> VIR_N_ELEMENTS(virPyDomainBlockCopyParams)) < 0) {
> return NULL;
> }
> - } else {
> + } else if (pyobj_dict != Py_None) {
> PyErr_Format(PyExc_TypeError, "block params must be a
> dictionary");
> return NULL;
> }
>
> dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom);
> --
> 2.17.2
>
>
Tested with oVirt master and qemu master, live storage migration completed
successfully.
Nir
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20190311/47379140/attachment-0001.htm>
More information about the libvir-list
mailing list