From nobody Sun Feb 8 17:22:18 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.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; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491926061059110.41800072725187; Tue, 11 Apr 2017 08:54:21 -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 BE8D63DBCA; Tue, 11 Apr 2017 15:54:19 +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 91EE27ED84; Tue, 11 Apr 2017 15:54:19 +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 4647B18523D2; Tue, 11 Apr 2017 15:54:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3BFs4FM001623 for ; Tue, 11 Apr 2017 11:54:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 836587ED83; Tue, 11 Apr 2017 15:54:04 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id D83C57ED98; Tue, 11 Apr 2017 15:54:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BE8D63DBCA Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BE8D63DBCA From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 11 Apr 2017 17:53:50 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/9] virsh: Add wrapper for virDomainSnapshotFree 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: , MIME-Version: 1.0 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.30]); Tue, 11 Apr 2017 15:54:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Similarly to virshDomainFree add a wrapper for the snapshot object freeing function. --- tools/virsh-snapshot.c | 48 ++++++++++++++++++----------------------------= -- tools/virsh-util.c | 10 ++++++++++ tools/virsh-util.h | 3 +++ 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 5af9a7d7a..24cd4abd9 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -106,8 +106,7 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, = const char *buffer, cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); VIR_FREE(doc); return ret; } @@ -601,10 +600,8 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) cleanup: if (!ret && name) vshError(ctl, _("Failed to update %s"), name); - if (edited) - virDomainSnapshotFree(edited); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(edited); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; } @@ -681,7 +678,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!(snapshot2 =3D virDomainSnapshotCreateXML(dom, xml, flags))) goto cleanup; - virDomainSnapshotFree(snapshot2); + virshDomainSnapshotFree(snapshot2); vshPrintExtra(ctl, _("Snapshot %s set as current"), snapshotname); ret =3D true; goto cleanup; @@ -717,8 +714,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!ret) vshReportError(ctl); VIR_FREE(xml); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -777,8 +773,7 @@ virshGetSnapshotParent(vshControl *ctl, virDomainSnapsh= otPtr snapshot, } else { vshResetLibvirtError(); } - if (parent) - virDomainSnapshotFree(parent); + virshDomainSnapshotFree(parent); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); VIR_FREE(xml); @@ -906,7 +901,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) if (other) { if (STREQ(name, virDomainSnapshotGetName(other))) current =3D 1; - virDomainSnapshotFree(other); + virshDomainSnapshotFree(other); } } vshPrint(ctl, "%-15s %s\n", _("Current:"), @@ -1005,8 +1000,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) xmlFreeDoc(xmldoc); VIR_FREE(doc); VIR_FREE(parent); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; } @@ -1031,8 +1025,7 @@ virshSnapshotListFree(virshSnapshotListPtr snaplist) return; if (snaplist->snaps) { for (i =3D 0; i < snaplist->nsnaps; i++) { - if (snaplist->snaps[i].snap) - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); VIR_FREE(snaplist->snaps[i].parent); } VIR_FREE(snaplist->snaps); @@ -1270,7 +1263,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPt= r dom, STRNEQ_NULLABLE(fromname, snaplist->snaps[i].parent)))) || (roots && snaplist->snaps[i].parent)) { - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap =3D NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1298,7 +1291,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPt= r dom, for (i =3D 0; i < count; i++) { if (i =3D=3D start_index || !snaplist->snaps[i].parent) { VIR_FREE(names[i]); - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap =3D NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1336,7 +1329,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPt= r dom, if (!found_parent) { changed =3D true; VIR_FREE(names[i]); - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap =3D NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1359,7 +1352,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPt= r dom, case 1: break; case 0: - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap =3D NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1641,8 +1634,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) virshSnapshotListFree(snaplist); VIR_FREE(parent_snap); VIR_FREE(state); - if (start) - virDomainSnapshotFree(start); + virshDomainSnapshotFree(start); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(doc); @@ -1708,8 +1700,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xml); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -1768,8 +1759,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(parent); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -1853,8 +1843,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd= *cmd) ret =3D true; cleanup: - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -1935,8 +1924,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) ret =3D true; cleanup: - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 5fdb40855..e225d3332 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -160,3 +160,13 @@ virshDomainFree(virDomainPtr dom) virDomainFree(dom); /* sc_prohibit_obj_free_apis_in_virsh */ } + + +void +virshDomainSnapshotFree(virDomainSnapshotPtr snap) +{ + if (!snap) + return; + + virDomainSnapshotFree(snap); /* sc_prohibit_obj_free_apis_in_virsh */ +} diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 78f7a0ea9..2b5aedfba 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -41,6 +41,9 @@ virshCommandOptDomain(vshControl *ctl, void virshDomainFree(virDomainPtr dom); +void +virshDomainSnapshotFree(virDomainSnapshotPtr snap); + int virshDomainState(vshControl *ctl, virDomainPtr dom, --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list