From nobody Sun Feb 8 14:10:11 2026 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531747539510184.37610021867647; Mon, 16 Jul 2018 06:25:39 -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 2D48F87628; Mon, 16 Jul 2018 13:25:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F267A60BE4; Mon, 16 Jul 2018 13:25:37 +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 A80214BB78; Mon, 16 Jul 2018 13:25:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6GDOvU2028251 for ; Mon, 16 Jul 2018 09:24:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 322972026D76; Mon, 16 Jul 2018 13:24:57 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D8312026D65; Mon, 16 Jul 2018 13:24:56 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:24:14 +0100 Message-Id: <20180716132423.10354-29-berrange@redhat.com> In-Reply-To: <20180716132423.10354-1-berrange@redhat.com> References: <20180716132423.10354-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 28/37] interface: fix error reporting thread safety 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: , Content-Type: text/plain; charset="utf-8" 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.26]); Mon, 16 Jul 2018 13:25:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Create wrapper functions for each interface C API that accepts a virErrorPtr parameter. This avoids accessing a thread local from a goroutine which may race with other goroutines doing native API calls in the same OS thread. Signed-off-by: Daniel P. Berrang=C3=A9 --- interface.go | 45 +++++++++------- interface_wrapper.go | 124 +++++++++++++++++++++++++++++++++++++++++++ interface_wrapper.h | 44 +++++++++++++++ 3 files changed, 195 insertions(+), 18 deletions(-) diff --git a/interface.go b/interface.go index bd39ed0..9b6ebb2 100644 --- a/interface.go +++ b/interface.go @@ -49,27 +49,30 @@ type Interface struct { =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceCreate func (n *Interface) Create(flags uint32) error { - result :=3D C.virInterfaceCreate(n.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virInterfaceCreateWrapper(n.ptr, C.uint(flags), &err) if result =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceDestroy func (n *Interface) Destroy(flags uint32) error { - result :=3D C.virInterfaceDestroy(n.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virInterfaceDestroyWrapper(n.ptr, C.uint(flags), &err) if result =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceIsActive func (n *Interface) IsActive() (bool, error) { - result :=3D C.virInterfaceIsActive(n.ptr) + var err C.virError + result :=3D C.virInterfaceIsActiveWrapper(n.ptr, &err) if result =3D=3D -1 { - return false, GetLastError() + return false, makeError(&err) } if result =3D=3D 1 { return true, nil @@ -79,9 +82,10 @@ func (n *Interface) IsActive() (bool, error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceGetMACString func (n *Interface) GetMACString() (string, error) { - result :=3D C.virInterfaceGetMACString(n.ptr) + var err C.virError + result :=3D C.virInterfaceGetMACStringWrapper(n.ptr, &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } mac :=3D C.GoString(result) return mac, nil @@ -89,9 +93,10 @@ func (n *Interface) GetMACString() (string, error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceGetName func (n *Interface) GetName() (string, error) { - result :=3D C.virInterfaceGetName(n.ptr) + var err C.virError + result :=3D C.virInterfaceGetNameWrapper(n.ptr, &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } name :=3D C.GoString(result) return name, nil @@ -99,9 +104,10 @@ func (n *Interface) GetName() (string, error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceGetXMLDesc func (n *Interface) GetXMLDesc(flags InterfaceXMLFlags) (string, error) { - result :=3D C.virInterfaceGetXMLDesc(n.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virInterfaceGetXMLDescWrapper(n.ptr, C.uint(flags), &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } xml :=3D C.GoString(result) C.free(unsafe.Pointer(result)) @@ -110,27 +116,30 @@ func (n *Interface) GetXMLDesc(flags InterfaceXMLFlag= s) (string, error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceUndefine func (n *Interface) Undefine() error { - result :=3D C.virInterfaceUndefine(n.ptr) + var err C.virError + result :=3D C.virInterfaceUndefineWrapper(n.ptr, &err) if result =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceFree func (n *Interface) Free() error { - ret :=3D C.virInterfaceFree(n.ptr) + var err C.virError + ret :=3D C.virInterfaceFreeWrapper(n.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-interface.html#virInt= erfaceRef func (c *Interface) Ref() error { - ret :=3D C.virInterfaceRef(c.ptr) + var err C.virError + ret :=3D C.virInterfaceRefWrapper(c.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } diff --git a/interface_wrapper.go b/interface_wrapper.go index c9618fb..a33aea9 100644 --- a/interface_wrapper.go +++ b/interface_wrapper.go @@ -30,5 +30,129 @@ package libvirt #include #include "interface_wrapper.h" =20 + +int +virInterfaceCreateWrapper(virInterfacePtr iface, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virInterfaceCreate(iface, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virInterfaceDestroyWrapper(virInterfacePtr iface, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virInterfaceDestroy(iface, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virInterfaceFreeWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + int ret =3D virInterfaceFree(iface); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +virConnectPtr +virInterfaceGetConnectWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + virConnectPtr ret =3D virInterfaceGetConnect(iface); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +const char * +virInterfaceGetMACStringWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + const char * ret =3D virInterfaceGetMACString(iface); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +const char * +virInterfaceGetNameWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + const char * ret =3D virInterfaceGetName(iface); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +char * +virInterfaceGetXMLDescWrapper(virInterfacePtr iface, + unsigned int flags, + virErrorPtr err) +{ + char * ret =3D virInterfaceGetXMLDesc(iface, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +int +virInterfaceIsActiveWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + int ret =3D virInterfaceIsActive(iface); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virInterfaceRefWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + int ret =3D virInterfaceRef(iface); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virInterfaceUndefineWrapper(virInterfacePtr iface, + virErrorPtr err) +{ + int ret =3D virInterfaceUndefine(iface); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + */ import "C" diff --git a/interface_wrapper.h b/interface_wrapper.h index 8b1f8f1..b7cef76 100644 --- a/interface_wrapper.h +++ b/interface_wrapper.h @@ -29,4 +29,48 @@ #include #include =20 +int +virInterfaceCreateWrapper(virInterfacePtr iface, + unsigned int flags, + virErrorPtr err); + +int +virInterfaceDestroyWrapper(virInterfacePtr iface, + unsigned int flags, + virErrorPtr err); + +int +virInterfaceFreeWrapper(virInterfacePtr iface, + virErrorPtr err); + +virConnectPtr +virInterfaceGetConnectWrapper(virInterfacePtr iface, + virErrorPtr err); + +const char * +virInterfaceGetMACStringWrapper(virInterfacePtr iface, + virErrorPtr err); + +const char * +virInterfaceGetNameWrapper(virInterfacePtr iface, + virErrorPtr err); + +char * +virInterfaceGetXMLDescWrapper(virInterfacePtr iface, + unsigned int flags, + virErrorPtr err); + +int +virInterfaceIsActiveWrapper(virInterfacePtr iface, + virErrorPtr err); + +int +virInterfaceRefWrapper(virInterfacePtr iface, + virErrorPtr err); + +int +virInterfaceUndefineWrapper(virInterfacePtr iface, + virErrorPtr err); + + #endif /* LIBVIRT_GO_INTERFACE_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list