From nobody Sun Feb 8 22:43:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1642011064; cv=none; d=zohomail.com; s=zohoarc; b=PxFqkwLiS80qb7b4tY7ExlTBgD3mV18tMLNaX9aTqDIwNC2P1bLWtXWWso2l9MjLreSHZijVZ2JdWPhW9J7F9Bvu+h9/NqZ5k3TPTCyX+2FHQQmNovIVI5+X5sIfsmETH24UHdfREGXYn1AJs5z3kY2lxlxtaePa67ZkbiN/upk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642011064; 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=s/71ZddneA6Nk/yZ+LPi8lLlQXFPuCtqhgknHN3SslM=; b=VB0MWLHQnWQLEF9N9SgDtp7LQUHTkQGEOM/UK8HwVUWD+JPO18CISniK5R3Uu00KuAZa/vz34HtvBVuvX1jgfzjh2LrjSY6dxTSXTWibtEJof6s6bZJcwXP6oEsDrr8K/yZSw0MdScPhxVKsW4ILiRodLPxGjcbO+Cnnmi+UHB0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642011064151391.8485050983794; Wed, 12 Jan 2022 10:11:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-88-o9QTtImVOGes_5CoCIyi-A-1; Wed, 12 Jan 2022 13:11:01 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A478100C618; Wed, 12 Jan 2022 18:10:56 +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 2AE42105C725; Wed, 12 Jan 2022 18:10:56 +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 ECB654A7C8; Wed, 12 Jan 2022 18:10:55 +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 20CIAqXc003184 for ; Wed, 12 Jan 2022 13:10:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0C77D8AC23; Wed, 12 Jan 2022 18:10:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 633EF8AC21 for ; Wed, 12 Jan 2022 18:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642011063; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=s/71ZddneA6Nk/yZ+LPi8lLlQXFPuCtqhgknHN3SslM=; b=DMdRFcRWH3HsDIc4uhctTFPx/qaPNtOkbXzHqhNSxbW2c2VWG4NXevkHhq9Lf+4wKSj9O9 AbZ0xSY65P7JwR5BrwEJlaDltXyIFDGK0ea2nxMh5vgaRK8JfpRGQf+I9H3avuXuLx60G/ /+6BT/QgE0oue44L727YznZCinljMPU= X-MC-Unique: o9QTtImVOGes_5CoCIyi-A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/17] virDomainSnapshotAssignDef: Clear second argument when it is consumed Date: Wed, 12 Jan 2022 19:10:16 +0100 Message-Id: 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 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642011065080100001 Content-Type: text/plain; charset="utf-8" Rather than callers second-guessing when the snapshot definition is assigned turn it into a double pointer and clear it on success. Fix callers to work with the new semantics. Signed-off-by: Peter Krempa --- src/conf/virdomainsnapshotobjlist.c | 10 ++++++++-- src/conf/virdomainsnapshotobjlist.h | 2 +- src/qemu/qemu_driver.c | 4 +--- src/qemu/qemu_snapshot.c | 6 ++---- src/test/test_driver.c | 12 ++++-------- src/vz/vz_sdk.c | 3 +-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapsh= otobjlist.c index 0ccdf31ae0..6b074d5994 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -42,9 +42,15 @@ struct _virDomainSnapshotObjList { virDomainMomentObj * virDomainSnapshotAssignDef(virDomainSnapshotObjList *snapshots, - virDomainSnapshotDef *def) + virDomainSnapshotDef **snapdefptr) { - return virDomainMomentAssignDef(snapshots->base, &def->parent); + virDomainSnapshotDef *snapdef =3D *snapdefptr; + virDomainMomentObj *ret =3D virDomainMomentAssignDef(snapshots->base, = &snapdef->parent); + + if (ret) + *snapdefptr =3D NULL; + + return ret; } diff --git a/src/conf/virdomainsnapshotobjlist.h b/src/conf/virdomainsnapsh= otobjlist.h index eebeb9f5a3..bdbc17f6d5 100644 --- a/src/conf/virdomainsnapshotobjlist.h +++ b/src/conf/virdomainsnapshotobjlist.h @@ -30,7 +30,7 @@ virDomainSnapshotObjList *virDomainSnapshotObjListNew(voi= d); void virDomainSnapshotObjListFree(virDomainSnapshotObjList *snapshots); virDomainMomentObj *virDomainSnapshotAssignDef(virDomainSnapshotObjList *s= napshots, - virDomainSnapshotDef *def); + virDomainSnapshotDef **snap= defptr); int virDomainSnapshotObjListGetNames(virDomainSnapshotObjList *snapshots, virDomainMomentObj *from, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b3588f9478..e150b86cef 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -396,9 +396,7 @@ qemuDomainSnapshotLoad(virDomainObj *vm, continue; } - snap =3D virDomainSnapshotAssignDef(vm->snapshots, snapdef); - if (snap) - snapdef =3D NULL; + snap =3D virDomainSnapshotAssignDef(vm->snapshots, &snapdef); if (cur && snap) { if (current) virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c5379d583e..3e35ff5463 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1721,9 +1721,8 @@ qemuSnapshotRedefine(virDomainObj *vm, return NULL; if (!snap) { - if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, snapdef))) + if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, &snapdef)= )) return NULL; - snapdef =3D NULL; } /* XXX Should we validate that the redefined snapshot even * makes sense, such as checking that qemu-img recognizes the @@ -1772,9 +1771,8 @@ qemuSnapshotCreate(virDomainObj *vm, snap->def =3D &snapdef->parent; snapdef =3D NULL; } else { - if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, snapdef))) + if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, &snapdef)= )) return NULL; - snapdef =3D NULL; if ((current =3D virDomainSnapshotGetCurrent(vm->snapshots))) { snap->def->parent_name =3D g_strdup(current->def->name); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e772b2be2b..14617d4f0d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -968,7 +968,7 @@ testParseDomainSnapshots(testDriver *privconn, for (i =3D 0; i < nsdata->num_snap_nodes; i++) { virDomainMomentObj *snap; - virDomainSnapshotDef *def; + g_autoptr(virDomainSnapshotDef) def =3D NULL; xmlNodePtr node =3D testParseXMLDocFromFile(nodes[i], file, "domainsnapshot"); if (!node) @@ -984,10 +984,8 @@ testParseDomainSnapshots(testDriver *privconn, if (!def) return -1; - if (!(snap =3D virDomainSnapshotAssignDef(domobj->snapshots, def))= ) { - virObjectUnref(def); + if (!(snap =3D virDomainSnapshotAssignDef(domobj->snapshots, &def)= )) return -1; - } if (cur) { if (virDomainSnapshotGetCurrent(domobj->snapshots)) { @@ -8755,9 +8753,8 @@ testDomainSnapshotRedefine(virDomainObj *vm, return NULL; if (!snap) { - if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, snapdef))) + if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, &snapdef)= )) return NULL; - snapdef =3D NULL; } *snapout =3D snap; @@ -8846,9 +8843,8 @@ testDomainSnapshotCreateXML(virDomainPtr domain, if (testDomainSnapshotAlignDisks(vm, def, flags) < 0) goto cleanup; - if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, def))) + if (!(snap =3D virDomainSnapshotAssignDef(vm->snapshots, &def))) goto cleanup; - def =3D NULL; snap->def->parent_name =3D g_strdup(virDomainSnapshotGetCurrentName(vm= ->snapshots)); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 5ed33902fd..94c6cd5c7a 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4661,9 +4661,8 @@ prlsdkParseSnapshotTree(const char *treexml) } VIR_FREE(xmlstr); - if (!(snapshot =3D virDomainSnapshotAssignDef(snapshots, def))) + if (!(snapshot =3D virDomainSnapshotAssignDef(snapshots, &def))) goto cleanup; - def =3D NULL; xmlstr =3D virXPathString("string(./@current)", ctxt); if (xmlstr && STREQ("yes", xmlstr)) { --=20 2.31.1