From nobody Mon Apr 29 11:25:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1506639647648883.7883771452756; Thu, 28 Sep 2017 16:00:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B887981DE2; Thu, 28 Sep 2017 23:00:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2454B18820; Thu, 28 Sep 2017 23:00:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ADA2B1806102; Thu, 28 Sep 2017 23:00:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8SMTFT0025325 for ; Thu, 28 Sep 2017 18:29:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id C6939672E8; Thu, 28 Sep 2017 22:29:15 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5B121810F; Thu, 28 Sep 2017 22:29:13 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A572EC04AC43; Thu, 28 Sep 2017 22:29:11 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id u48so3380731wrf.4; Thu, 28 Sep 2017 15:29:11 -0700 (PDT) Received: from lean.com (bzq-109-65-255-5.red.bezeqint.net. [109.65.255.5]) by smtp.gmail.com with ESMTPSA id i10sm1146619wmf.14.2017.09.28.15.29.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 15:29:09 -0700 (PDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B887981DE2 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B887981DE2 Authentication-Results: mx1.redhat.com; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cOnzt232" DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A572EC04AC43 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=nirsof@gmail.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A572EC04AC43 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eraWRYiEAZM8rj6WwdiZ+Hy4fh4WEigu8EeF5+XbmVM=; b=cOnzt232bNR34a+svdd3tPCNy+UraQyBXTnrBxRnaKRkZX5u1JtdCMEeJrES/pc+Fs IZg59SXxgK7xmYMiO4O7L3JH2ZXbCJzAoLqvaj25jieEcgomwMGvQYdbfFgFmaiVBsC4 UKpv4cDbgiZZNO4ArE6PpWfSJh1nYvvm6YIkb7+R8h4dAvUzP2K5ol7FHZOioUyhCC4O 0J8fFDdR9pwOYxNeTBWY8EbGEK05uE6Zp0dZLKSf+yP3j1OBnX0hRq0W2Py0IhVdemUa 3hz1i1WXtR6RCeege0XHQRK7m9kokZwbkUVYyUtGQ6nclp/HHDZmdFiFz41KJo7TSdQg IehQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eraWRYiEAZM8rj6WwdiZ+Hy4fh4WEigu8EeF5+XbmVM=; b=BtMHrlsAXXhqS1V2c5hfcOG28U3Ohj3uBOTV6NM5I4ByHRKGg2lGwqx3HuDnAtvPaf BzbiTKr+h0YgTManu0kXUQ0R9Tt9AyRUeZYuY7S/hHxVVlsRIXO5GQrHa+DHcTCjXZ+t MkgHXRi7vpE4ICm5YhNI5+TlO+EV0lHE2VPfNDHDTxzkfUarPbTSmDiU1Fe+Hw9E/WUx WSA5H6kw82Sj8mNkG6005R4EaXWuFGgWtjIJLgI+sfo7ryWNtOxs6wAzubVx7MTme5jg jyH1lddX0MKFb0GhkjgqwAqQCiHNcq2aECTdmH1DTo6eDPVlt1+tmrlQM5AoUnyMSgh+ RMyw== X-Gm-Message-State: AHPjjUjZTwMHo37kGPo3l3nxLbTbEE+FYg1RDTdprBp1U4ezohxOuBzy +m7U3g9tfhTecZRlXITu/RsMuoiP X-Google-Smtp-Source: AOwi7QA4kDm5yYVxRNMc1YUXNw/ucIRYRiWIvE9UQl+W8yHpggr7OdYHA1ESLMLt5TqNoqPmjnM6Zw== X-Received: by 10.223.138.238 with SMTP id z43mr5503247wrz.83.1506637749793; Thu, 28 Sep 2017 15:29:09 -0700 (PDT) From: Nir Soffer To: libvir-list@redhat.com Date: Fri, 29 Sep 2017 01:28:20 +0300 Message-Id: <20170928222820.26769-1-nirsof@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 28 Sep 2017 22:29:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 28 Sep 2017 22:29:12 +0000 (UTC) for IP:'209.85.128.196' DOMAIN:'mail-wr0-f196.google.com' HELO:'mail-wr0-f196.google.com' FROM:'nirsof@gmail.com' RCPT:'' X-RedHat-Spam-Score: -2.41 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_SPAM, SPF_PASS) 209.85.128.196 mail-wr0-f196.google.com 209.85.128.196 mail-wr0-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Pavel Hrdina , Nir Soffer Subject: [libvirt] [PATCH python] Unify whitespace around *_ALLOW_THREADS macros X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 28 Sep 2017 23:00:46 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Most of the code treats libvirt API calls as separate block, keeping one blank line before the LIBVIRT_BEGIN_ALLOW_THREAD, and one blank line after LIBVIRT_END_ALLOW_THREADS. Unify the whitespace so all calls wrapped with these macros are treated as a separate block. Reviewed-by: Daniel P. Berrange --- libvirt-override.c | 115 ++++++++++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 87 insertions(+), 28 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index f5ff605..d746350 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -441,6 +441,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetSchedulerType(domain, &nparams); LIBVIRT_END_ALLOW_THREADS; + if (c_retval =3D=3D NULL) return VIR_PY_NONE; =20 @@ -1221,6 +1222,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UN= USED, LIBVIRT_BEGIN_ALLOW_THREADS; i_retval =3D virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) return VIR_PY_NONE; =20 @@ -1239,6 +1241,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UN= USED, cpuinfo, dominfo.nrVirtCpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { error =3D VIR_PY_NONE; goto cleanup; @@ -1402,6 +1405,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; i_retval =3D virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) return VIR_PY_NONE; =20 @@ -1522,6 +1526,7 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self AT= TRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; ret =3D virDomainGetEmulatorPinInfo(domain, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; + if (ret < 0) { VIR_FREE(cpumap); return VIR_PY_NONE; @@ -1660,6 +1665,7 @@ libvirt_virDomainPinIOThread(PyObject *self ATTRIBUTE= _UNUSED, i_retval =3D virDomainPinIOThread(domain, iothread_val, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { ret =3D VIR_PY_INT_FAIL; goto cleanup; @@ -1728,6 +1734,7 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_= UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; err =3D virConnGetLastError(conn); LIBVIRT_END_ALLOW_THREADS; + if (err =3D=3D NULL) return VIR_PY_NONE; =20 @@ -1970,9 +1977,9 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_U= NUSED, auth.cbdata =3D pyauth; =20 LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval =3D virConnectOpenAuth(name, &auth, flags); LIBVIRT_END_ALLOW_THREADS; + VIR_FREE(auth.credtype); py_retval =3D libvirt_virConnectPtrWrap((virConnectPtr) c_retval); return py_retval; @@ -1997,12 +2004,10 @@ libvirt_virGetVersion(PyObject *self ATTRIBUTE_UNUS= ED, return NULL; =20 LIBVIRT_BEGIN_ALLOW_THREADS; - if (type =3D=3D NULL) c_retval =3D virGetVersion(&libVer, NULL, NULL); else c_retval =3D virGetVersion(&libVer, type, &typeVer); - LIBVIRT_END_ALLOW_THREADS; =20 if (c_retval =3D=3D -1) @@ -2029,9 +2034,7 @@ libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE= _UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval =3D virConnectGetVersion(conn, &hvVersion); - LIBVIRT_END_ALLOW_THREADS; =20 if (c_retval =3D=3D -1) @@ -2059,9 +2062,7 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATT= RIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval =3D virConnectGetCPUModelNames(conn, arch, &models, flags); - LIBVIRT_END_ALLOW_THREADS; =20 if (c_retval =3D=3D -1) @@ -2103,9 +2104,7 @@ libvirt_virConnectGetLibVersion(PyObject *self ATTRIB= UTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval =3D virConnectGetLibVersion(conn, &libVer); - LIBVIRT_END_ALLOW_THREADS; =20 if (c_retval =3D=3D -1) @@ -2132,6 +2131,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfDomains(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2142,6 +2142,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListDomains(conn, ids, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -2186,6 +2187,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRI= BUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllDomains(conn, &doms, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2231,15 +2233,18 @@ libvirt_virConnectListDefinedDomains(PyObject *self= ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfDefinedDomains(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListDefinedDomains(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -2287,15 +2292,18 @@ libvirt_virDomainSnapshotListNames(PyObject *self A= TTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainSnapshotNum(dom, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainSnapshotListNames(dom, names, c_retval, flag= s); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -2341,6 +2349,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainListAllSnapshots(dom, &snaps, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2386,16 +2395,19 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject= *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainSnapshotNumChildren(snap, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainSnapshotListChildrenNames(snap, names, c_ret= val, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -2441,6 +2453,7 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *se= lf ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainSnapshotListAllChildren(parent, &snaps, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2484,6 +2497,7 @@ libvirt_virDomainRevertToSnapshot(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainRevertToSnapshot(snap, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_INT_FAIL; =20 @@ -2507,6 +2521,7 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNU= SED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetInfo(domain, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2549,6 +2564,7 @@ libvirt_virDomainGetState(PyObject *self ATTRIBUTE_UN= USED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetState(domain, &state, &reason, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2584,6 +2600,7 @@ libvirt_virDomainGetControlInfo(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetControlInfo(domain, &info, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2622,6 +2639,7 @@ libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUT= E_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetBlockInfo(domain, path, &info, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2659,6 +2677,7 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSE= D, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeGetInfo(conn, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2701,6 +2720,7 @@ libvirt_virNodeGetSecurityModel(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeGetSecurityModel(conn, &model); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2737,6 +2757,7 @@ libvirt_virDomainGetSecurityLabel(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetSecurityLabel(dom, &label); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -2823,6 +2844,7 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNU= SED, =20 if (domain =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetUUID(domain, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -2849,6 +2871,7 @@ libvirt_virDomainGetUUIDString(PyObject *self ATTRIBU= TE_UNUSED, =20 if (dom =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetUUIDString(dom, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -2905,15 +2928,18 @@ libvirt_virConnectListNetworks(PyObject *self ATTRI= BUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfNetworks(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListNetworks(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -2961,15 +2987,18 @@ libvirt_virConnectListDefinedNetworks(PyObject *sel= f ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfDefinedNetworks(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListDefinedNetworks(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -3016,6 +3045,7 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllNetworks(conn, &nets, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3057,6 +3087,7 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UN= USED, =20 if (domain =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNetworkGetUUID(domain, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3083,6 +3114,7 @@ libvirt_virNetworkGetUUIDString(PyObject *self ATTRIB= UTE_UNUSED, =20 if (net =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNetworkGetUUIDString(net, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3238,6 +3270,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_U= NUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3248,6 +3281,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_U= NUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeGetCPUStats(conn, cpuNum, stats, &nparams, fla= gs); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { VIR_FREE(stats); return VIR_PY_NONE; @@ -3296,6 +3330,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUT= E_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, flag= s); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3306,6 +3341,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUT= E_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeGetMemoryStats(conn, cellNum, stats, &nparams,= flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { VIR_FREE(stats); return VIR_PY_NONE; @@ -3350,15 +3386,18 @@ libvirt_virConnectListStoragePools(PyObject *self A= TTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfStoragePools(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListStoragePools(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -3404,15 +3443,18 @@ libvirt_virConnectListDefinedStoragePools(PyObject = *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfDefinedStoragePools(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListDefinedStoragePools(conn, names, c_retv= al); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -3461,6 +3503,7 @@ libvirt_virConnectListAllStoragePools(PyObject *self = ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllStoragePools(conn, &pools, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3506,6 +3549,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStoragePoolNumOfVolumes(pool); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3516,6 +3560,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStoragePoolListVolumes(pool, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -3564,6 +3609,7 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self A= TTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStoragePoolListAllVolumes(pool, &vols, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3632,6 +3678,7 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUT= E_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStoragePoolGetInfo(pool, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3672,6 +3719,7 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE= _UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStorageVolGetInfo(pool, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3711,6 +3759,7 @@ libvirt_virStorageVolGetInfoFlags(PyObject *self ATTR= IBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStorageVolGetInfoFlags(pool, &info, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3747,6 +3796,7 @@ libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUT= E_UNUSED, =20 if (pool =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStoragePoolGetUUID(pool, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3773,6 +3823,7 @@ libvirt_virStoragePoolGetUUIDString(PyObject *self AT= TRIBUTE_UNUSED, =20 if (pool =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virStoragePoolGetUUIDString(pool, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3829,6 +3880,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_U= NUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeNumOfDevices(conn, cap, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3887,6 +3939,7 @@ libvirt_virConnectListAllNodeDevices(PyObject *self A= TTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllNodeDevices(conn, &devices, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -3931,15 +3984,18 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeDeviceNumOfCaps(dev); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNodeDeviceListCaps(dev, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -3981,6 +4037,7 @@ libvirt_virSecretGetUUID(PyObject *self ATTRIBUTE_UNU= SED, =20 if (secret =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virSecretGetUUID(secret, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4007,6 +4064,7 @@ libvirt_virSecretGetUUIDString(PyObject *self ATTRIBU= TE_UNUSED, =20 if (dom =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virSecretGetUUIDString(dom, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4061,15 +4119,18 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfSecrets(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 if (c_retval) { if (VIR_ALLOC_N(uuids, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListSecrets(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -4118,6 +4179,7 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRI= BUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllSecrets(conn, &secrets, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4213,6 +4275,7 @@ libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_U= NUSED, =20 if (nwfilter =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNWFilterGetUUID(nwfilter, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4239,6 +4302,7 @@ libvirt_virNWFilterGetUUIDString(PyObject *self ATTRI= BUTE_UNUSED, =20 if (nwfilter =3D=3D NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virNWFilterGetUUIDString(nwfilter, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4294,6 +4358,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfNWFilters(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4304,6 +4369,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIB= UTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListNWFilters(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -4351,6 +4417,7 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATT= RIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllNWFilters(conn, &filters, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4397,6 +4464,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRI= BUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfInterfaces(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4407,6 +4475,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRI= BUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListInterfaces(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -4454,6 +4523,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *sel= f ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectNumOfDefinedInterfaces(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4464,6 +4534,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *sel= f ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListDefinedInterfaces(conn, names, c_retval= ); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval =3D VIR_PY_NONE; goto cleanup; @@ -4513,6 +4584,7 @@ libvirt_virConnectListAllInterfaces(PyObject *self AT= TRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virConnectListAllInterfaces(conn, &ifaces, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4610,6 +4682,7 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_= UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainGetJobInfo(domain, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; =20 @@ -4670,6 +4743,7 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE= _UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; rc =3D virDomainGetJobStats(domain, &type, ¶ms, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (rc < 0) return VIR_PY_NONE; =20 @@ -5147,11 +5221,9 @@ libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUS= ED PyObject *self, Py_INCREF(pyobj_conn_inst); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectDomainEventRegister(conn, libvirt_virConnectDomainEventCallb= ack, pyobj_conn_inst, NULL); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); @@ -5176,9 +5248,7 @@ libvirt_virConnectDomainEventDeregister(PyObject *sel= f ATTRIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectDomainEventDeregister(conn, libvirt_virConnectDomain= EventCallback); - LIBVIRT_END_ALLOW_THREADS; =20 Py_DECREF(pyobj_conn_inst); @@ -5464,18 +5534,16 @@ libvirt_virEventRegisterImpl(PyObject *self ATTRIBU= TE_UNUSED, Py_INCREF(updateTimeoutObj); Py_INCREF(removeTimeoutObj); =20 - LIBVIRT_BEGIN_ALLOW_THREADS; - /* Now register our C EventImpl, which will dispatch * to the Python callbacks passed in as args. */ + LIBVIRT_BEGIN_ALLOW_THREADS; virEventRegisterImpl(libvirt_virEventAddHandleFunc, libvirt_virEventUpdateHandleFunc, libvirt_virEventRemoveHandleFunc, libvirt_virEventAddTimeoutFunc, libvirt_virEventUpdateTimeoutFunc, libvirt_virEventRemoveTimeoutFunc); - LIBVIRT_END_ALLOW_THREADS; =20 return VIR_PY_INT_SUCCESS; @@ -7155,9 +7223,7 @@ libvirt_virConnectDomainEventDeregisterAny(PyObject *= self ATTRIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectDomainEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); @@ -7299,9 +7365,7 @@ libvirt_virConnectNetworkEventDeregisterAny(PyObject = *self ATTRIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectNetworkEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); @@ -7397,10 +7461,8 @@ libvirt_virConnectUnregisterCloseCallback(PyObject *= self ATTRIBUTE_UNUSED, conn =3D PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectUnregisterCloseCallback(conn, libvirt_virConnectCloseCallbac= kDispatch); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); @@ -8036,6 +8098,7 @@ libvirt_virDomainCreateWithFiles(PyObject *self ATTRI= BUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainCreateWithFiles(domain, nfiles, files, flags); LIBVIRT_END_ALLOW_THREADS; + py_retval =3D libvirt_intWrap((int) c_retval); =20 cleanup: @@ -8084,6 +8147,7 @@ libvirt_virDomainCreateXMLWithFiles(PyObject *self AT= TRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval =3D virDomainCreateXMLWithFiles(conn, xmlDesc, nfiles, files,= flags); LIBVIRT_END_ALLOW_THREADS; + py_retval =3D libvirt_virDomainPtrWrap((virDomainPtr) c_retval); =20 cleanup: @@ -8772,6 +8836,7 @@ libvirt_virDomainGetPerfEvents(PyObject *self ATTRIBU= TE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; rc =3D virDomainGetPerfEvents(domain, ¶ms, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (rc < 0) return VIR_PY_NONE; =20 @@ -9040,9 +9105,7 @@ libvirt_virConnectStoragePoolEventDeregisterAny(PyObj= ect *self ATTRIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectStoragePoolEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); @@ -9275,9 +9338,7 @@ libvirt_virConnectNodeDeviceEventDeregisterAny(PyObje= ct *self ATTRIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectNodeDeviceEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); @@ -9475,9 +9536,7 @@ libvirt_virConnectSecretEventDeregisterAny(PyObject *= self ATTRIBUTE_UNUSED, conn =3D (virConnectPtr) PyvirConnect_Get(pyobj_conn); =20 LIBVIRT_BEGIN_ALLOW_THREADS; - ret =3D virConnectSecretEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; =20 return libvirt_intWrap(ret); --=20 2.9.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list