From nobody Sat Feb 7 10:44:46 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 ARC-Seal: i=1; a=rsa-sha256; t=1571161061; cv=none; d=zoho.com; s=zohoarc; b=fBdrTGt82Rlz07ksG9ont4fo3YW0IvwxqGjp6BJeO/cxhi/x32dvEvqT+/H8ZRPjHtLvuRmHa1T6gycC+nF0bwWruMv2nICYBvFo9Lcq/nDar9cMI5G/hrX0j7iWgOJ8cBW1PwKrQEAdI4LkbEoNtvK4HRc8WkIct0YR0NPaISw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571161061; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=31Km+shQ7xmQ6iAYEe7mTaywqhDP1I/bfLAt8ViKWWE=; b=DDXL+QbII3hHj42xFx4Nt6KO+OvtVSHf9ZgwTCzu76H2xgNN6eirnCvt2o1YUBrfrt/YvVQbFNSdwuB7FqhRl/T2e9+8v9eqK/tJfMEvq3iHxJrFXblwev61p1tUbITkNMew44hEv2VqgMjol9EPRYXRJf9xCVmxNtVTSPQcnIg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571161061503271.97496282140946; Tue, 15 Oct 2019 10:37:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CBA4110DCC81; Tue, 15 Oct 2019 17:37:39 +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 A64F25D9CD; Tue, 15 Oct 2019 17:37:38 +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 DE7284EDA6; Tue, 15 Oct 2019 17:37:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FHbabN001211 for ; Tue, 15 Oct 2019 13:37:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D5B95D9E2; Tue, 15 Oct 2019 17:37:36 +0000 (UTC) Received: from unknown0050b6a41c42.attlocal.com (ovpn-116-31.phx2.redhat.com [10.3.116.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C8E65D9CD for ; Tue, 15 Oct 2019 17:37:35 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 13:37:20 -0400 Message-Id: <20191015173728.1633-3-jferlan@redhat.com> In-Reply-To: <20191015173728.1633-1-jferlan@redhat.com> References: <20191015173728.1633-1-jferlan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/10] src: Use consistent error preservation and restoration calls 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-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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Tue, 15 Oct 2019 17:37:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Provide some consistency over error message variable name and usage when saving error messages across possible other errors or possibility of resetting of the last error. Instead of virSaveLastError paired up with virSetError and virFreeError, we should use the newer virErrorPreserveLast and virRestoreError. Signed-off-by: John Ferlan --- src/libvirt-stream.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index ef83696bcd..fb646d0aef 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -622,12 +622,11 @@ virStreamSendAll(virStreamPtr stream, VIR_FREE(bytes); =20 if (ret !=3D 0) { - virErrorPtr orig_err =3D virSaveLastError(); + virErrorPtr orig_err; + + virErrorPreserveLast(&orig_err); virStreamAbort(stream); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); virDispatchError(stream->conn); } =20 @@ -794,12 +793,11 @@ int virStreamSparseSendAll(virStreamPtr stream, VIR_FREE(bytes); =20 if (ret !=3D 0) { - virErrorPtr orig_err =3D virSaveLastError(); + virErrorPtr orig_err; + + virErrorPreserveLast(&orig_err); virStreamAbort(stream); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); virDispatchError(stream->conn); } =20 @@ -900,12 +898,11 @@ virStreamRecvAll(virStreamPtr stream, VIR_FREE(bytes); =20 if (ret !=3D 0) { - virErrorPtr orig_err =3D virSaveLastError(); + virErrorPtr orig_err; + + virErrorPreserveLast(&orig_err); virStreamAbort(stream); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); virDispatchError(stream->conn); } =20 @@ -1034,12 +1031,11 @@ virStreamSparseRecvAll(virStreamPtr stream, VIR_FREE(bytes); =20 if (ret !=3D 0) { - virErrorPtr orig_err =3D virSaveLastError(); + virErrorPtr orig_err; + + virErrorPreserveLast(&orig_err); virStreamAbort(stream); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); virDispatchError(stream->conn); } =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list