From nobody Mon Feb 9 19:11:45 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 1531747533261402.43269488945487; Mon, 16 Jul 2018 06:25:33 -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 D17FDC04AC54; Mon, 16 Jul 2018 13:25:31 +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 9B18560E37; Mon, 16 Jul 2018 13:25:31 +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 39DA11853DA1; Mon, 16 Jul 2018 13:25:31 +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 w6GDOwcn028271 for ; Mon, 16 Jul 2018 09:24:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7031A2027047; Mon, 16 Jul 2018 13:24:58 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC7A22026D65; Mon, 16 Jul 2018 13:24:57 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:24:15 +0100 Message-Id: <20180716132423.10354-30-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 29/37] domain snapshot: 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.31]); Mon, 16 Jul 2018 13:25:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Create wrapper functions for each domain snapshot 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 --- domain_snapshot.go | 62 ++++++++----- domain_snapshot_wrapper.go | 181 +++++++++++++++++++++++++++++++++++++ domain_snapshot_wrapper.h | 70 ++++++++++++++ 3 files changed, 288 insertions(+), 25 deletions(-) diff --git a/domain_snapshot.go b/domain_snapshot.go index 706c1a9..65fbbb5 100644 --- a/domain_snapshot.go +++ b/domain_snapshot.go @@ -90,45 +90,50 @@ type DomainSnapshot struct { =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotFree func (s *DomainSnapshot) Free() error { - ret :=3D C.virDomainSnapshotFree(s.ptr) + var err C.virError + ret :=3D C.virDomainSnapshotFreeWrapper(s.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotRef func (c *DomainSnapshot) Ref() error { - ret :=3D C.virDomainSnapshotRef(c.ptr) + var err C.virError + ret :=3D C.virDomainSnapshotRefWrapper(c.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotDelete func (s *DomainSnapshot) Delete(flags DomainSnapshotDeleteFlags) error { - result :=3D C.virDomainSnapshotDelete(s.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virDomainSnapshotDeleteWrapper(s.ptr, C.uint(flags), &err) if result !=3D 0 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainRevertToSnapshot func (s *DomainSnapshot) RevertToSnapshot(flags DomainSnapshotRevertFlags)= error { - result :=3D C.virDomainRevertToSnapshot(s.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virDomainRevertToSnapshotWrapper(s.ptr, C.uint(flags), &err) if result !=3D 0 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotIsCurrent func (s *DomainSnapshot) IsCurrent(flags uint32) (bool, error) { - result :=3D C.virDomainSnapshotIsCurrent(s.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virDomainSnapshotIsCurrentWrapper(s.ptr, C.uint(flags), &er= r) if result =3D=3D -1 { - return false, GetLastError() + return false, makeError(&err) } if result =3D=3D 1 { return true, nil @@ -138,9 +143,10 @@ func (s *DomainSnapshot) IsCurrent(flags uint32) (bool= , error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotHasMetadata func (s *DomainSnapshot) HasMetadata(flags uint32) (bool, error) { - result :=3D C.virDomainSnapshotHasMetadata(s.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virDomainSnapshotHasMetadataWrapper(s.ptr, C.uint(flags), &= err) if result =3D=3D -1 { - return false, GetLastError() + return false, makeError(&err) } if result =3D=3D 1 { return true, nil @@ -150,9 +156,10 @@ func (s *DomainSnapshot) HasMetadata(flags uint32) (bo= ol, error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotGetXMLDesc func (s *DomainSnapshot) GetXMLDesc(flags DomainXMLFlags) (string, error) { - result :=3D C.virDomainSnapshotGetXMLDesc(s.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virDomainSnapshotGetXMLDescWrapper(s.ptr, C.uint(flags), &e= rr) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } xml :=3D C.GoString(result) C.free(unsafe.Pointer(result)) @@ -161,27 +168,30 @@ func (s *DomainSnapshot) GetXMLDesc(flags DomainXMLFl= ags) (string, error) { =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotGetName func (s *DomainSnapshot) GetName() (string, error) { - name :=3D C.virDomainSnapshotGetName(s.ptr) + var err C.virError + name :=3D C.virDomainSnapshotGetNameWrapper(s.ptr, &err) if name =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } return C.GoString(name), nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotGetParent func (s *DomainSnapshot) GetParent(flags uint32) (*DomainSnapshot, error) { - ptr :=3D C.virDomainSnapshotGetParent(s.ptr, C.uint(flags)) + var err C.virError + ptr :=3D C.virDomainSnapshotGetParentWrapper(s.ptr, C.uint(flags), &err) if ptr =3D=3D nil { - return nil, GetLastError() + return nil, makeError(&err) } return &DomainSnapshot{ptr: ptr}, nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotNumChildren func (s *DomainSnapshot) NumChildren(flags DomainSnapshotListFlags) (int, = error) { - result :=3D int(C.virDomainSnapshotNumChildren(s.ptr, C.uint(flags))) + var err C.virError + result :=3D int(C.virDomainSnapshotNumChildrenWrapper(s.ptr, C.uint(flags= ), &err)) if result =3D=3D -1 { - return 0, GetLastError() + return 0, makeError(&err) } return result, nil } @@ -191,12 +201,13 @@ func (s *DomainSnapshot) ListChildrenNames(flags Doma= inSnapshotListFlags) ([]str const maxNames =3D 1024 var names [maxNames](*C.char) namesPtr :=3D unsafe.Pointer(&names) - numNames :=3D C.virDomainSnapshotListChildrenNames( + var err C.virError + numNames :=3D C.virDomainSnapshotListChildrenNamesWrapper( s.ptr, (**C.char)(namesPtr), - maxNames, C.uint(flags)) + maxNames, C.uint(flags), &err) if numNames =3D=3D -1 { - return nil, GetLastError() + return nil, makeError(&err) } goNames :=3D make([]string, numNames) for k :=3D 0; k < int(numNames); k++ { @@ -209,9 +220,10 @@ func (s *DomainSnapshot) ListChildrenNames(flags Domai= nSnapshotListFlags) ([]str // See also https://libvirt.org/html/libvirt-libvirt-domain-snapshot.html#= virDomainSnapshotListAllChildren func (d *DomainSnapshot) ListAllChildren(flags DomainSnapshotListFlags) ([= ]DomainSnapshot, error) { var cList *C.virDomainSnapshotPtr - numVols :=3D C.virDomainSnapshotListAllChildren(d.ptr, (**C.virDomainSnap= shotPtr)(&cList), C.uint(flags)) + var err C.virError + numVols :=3D C.virDomainSnapshotListAllChildrenWrapper(d.ptr, (**C.virDom= ainSnapshotPtr)(&cList), C.uint(flags), &err) if numVols =3D=3D -1 { - return nil, GetLastError() + return nil, makeError(&err) } hdr :=3D reflect.SliceHeader{ Data: uintptr(unsafe.Pointer(cList)), diff --git a/domain_snapshot_wrapper.go b/domain_snapshot_wrapper.go index 75e3ea5..a061dee 100644 --- a/domain_snapshot_wrapper.go +++ b/domain_snapshot_wrapper.go @@ -30,5 +30,186 @@ package libvirt #include #include "domain_snapshot_wrapper.h" =20 + +int +virDomainRevertToSnapshotWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainRevertToSnapshot(snapshot, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotDeleteWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotDelete(snapshot, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotFreeWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotFree(snapshot); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +virConnectPtr +virDomainSnapshotGetConnectWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err) +{ + virConnectPtr ret =3D virDomainSnapshotGetConnect(snapshot); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +virDomainPtr +virDomainSnapshotGetDomainWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err) +{ + virDomainPtr ret =3D virDomainSnapshotGetDomain(snapshot); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +const char * +virDomainSnapshotGetNameWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err) +{ + const char * ret =3D virDomainSnapshotGetName(snapshot); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +virDomainSnapshotPtr +virDomainSnapshotGetParentWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + virDomainSnapshotPtr ret =3D virDomainSnapshotGetParent(snapshot, flag= s); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +char * +virDomainSnapshotGetXMLDescWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + char * ret =3D virDomainSnapshotGetXMLDesc(snapshot, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotHasMetadataWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotHasMetadata(snapshot, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotIsCurrentWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotIsCurrent(snapshot, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotListAllChildrenWrapper(virDomainSnapshotPtr snapshot, + virDomainSnapshotPtr **snaps, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotListAllChildren(snapshot, snaps, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotListChildrenNamesWrapper(virDomainSnapshotPtr snapshot, + char **names, + int nameslen, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotListChildrenNames(snapshot, names, namesl= en, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotNumChildrenWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotNumChildren(snapshot, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainSnapshotRefWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err) +{ + int ret =3D virDomainSnapshotRef(snapshot); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + */ import "C" diff --git a/domain_snapshot_wrapper.h b/domain_snapshot_wrapper.h index 45464ce..fcf8036 100644 --- a/domain_snapshot_wrapper.h +++ b/domain_snapshot_wrapper.h @@ -29,4 +29,74 @@ #include #include =20 + +int +virDomainRevertToSnapshotWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotDeleteWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotFreeWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err); + +virConnectPtr +virDomainSnapshotGetConnectWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err); + +virDomainPtr +virDomainSnapshotGetDomainWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err); + +const char * +virDomainSnapshotGetNameWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err); + +virDomainSnapshotPtr +virDomainSnapshotGetParentWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +char * +virDomainSnapshotGetXMLDescWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotHasMetadataWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotIsCurrentWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotListAllChildrenWrapper(virDomainSnapshotPtr snapshot, + virDomainSnapshotPtr **snaps, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotListChildrenNamesWrapper(virDomainSnapshotPtr snapshot, + char **names, + int nameslen, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotNumChildrenWrapper(virDomainSnapshotPtr snapshot, + unsigned int flags, + virErrorPtr err); + +int +virDomainSnapshotRefWrapper(virDomainSnapshotPtr snapshot, + virErrorPtr err); + + #endif /* LIBVIRT_GO_DOMAIN_SNAPSHOT_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list