From nobody Mon Feb 9 10:32:19 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=1559748615; cv=none; d=zoho.com; s=zohoarc; b=b3mihS6sbKt9pZmr7i5ctTMd/MT+oQo9M6XI2gIbNAI7Xjjb+dg3MWjhHlA4FpelA8ktjvOfQelcgEmr4PsHkIISWG6+JrqlfdYxpAO2Jk6fon3hng/vbmR1N4dzThukuuScitIoav5TOro18p3PNtq+pafxnuaOPXNLtg5wyEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559748615; 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:ARC-Authentication-Results; bh=XZjdxM9ezHBhQL+/IPfpI9eNUX2iNsBgQS1vd06BGl4=; b=MSBc9WbI/Oo7ov0CKa1lBhoqlWR2s/NQi9EuhLXPElPNNWOZ0f4bqTS6pXJr1H/afrlAhoItcmJWkBFoYAZo70oIL6WM9OwcjXBjV+VhxMNIzYguJTVuITJ1kkUCBUycpWT0qTlpcanAvUnslA9K/OFnJUXmJJhNs0ftZLNjtC8= 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 1559748615628715.0119895278062; Wed, 5 Jun 2019 08:30:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C6FE2F8BC0; Wed, 5 Jun 2019 15:30:03 +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 CF56A1018A31; Wed, 5 Jun 2019 15:30:01 +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 758331806B11; Wed, 5 Jun 2019 15:30:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x55FSmle012966 for ; Wed, 5 Jun 2019 11:28:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id B9AB217F22; Wed, 5 Jun 2019 15:28:48 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4263960920 for ; Wed, 5 Jun 2019 15:28:48 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Jun 2019 17:28:33 +0200 Message-Id: <0fb5fc017c53219bd9f598cbbff0690b1d3fe845.1559748399.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/13] qemu: snapshot: Unify 'cleanup' and 'error' in qemuDomainSnapshotCreateDiskActive 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 05 Jun 2019 15:30:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" All cases taking the 'cleanup' path can take the original 'error' path. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 17270d5f83..5b6d3bb795 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15267,7 +15267,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, if (qemuDomainSnapshotCreateSingleDiskActive(driver, vm, &diskdata[i], actions, reuse) < 0) - goto error; + goto cleanup; do_transaction =3D true; } @@ -15291,12 +15291,12 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverP= tr driver, } if (rc < 0) - goto error; + goto cleanup; } ret =3D 0; - error: + cleanup: if (ret < 0) { virErrorPreserveLast(&orig_err); } else { @@ -15320,7 +15320,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, vm->newDef) < 0)) ret =3D -1; - cleanup: qemuDomainSnapshotDiskDataFree(diskdata, ndiskdata, driver, vm); virErrorRestore(&orig_err); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list