From nobody Sun Feb 8 18:09:44 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=1628617803; cv=none; d=zohomail.com; s=zohoarc; b=RIYemFRfGAUXXMUPhvE8n7NtNQtXJKSf2sLLiO98eFG3ySsrNhQuqztS448xC62/mWrf60vN2UsHkdaFqcx9kxXrxmMhAM4mmjHbFDK5AfA/NA2BMrnxOz9PZ5FP/W0EMvdkQXbqr1o0Jl+TZkOFYqHIBLD01fH0wxmoOwCVtXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628617803; 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=LkeN7EsBn5pxlH3mJug52ruCIGDNd/Wh6RNUSuIG4r0=; b=COGAVo3wmopeZW2ywKV1tEFIAmSRkfre1qTVPNE/U+8Ywh/upJt/S1DaH/0XJN9Ndx26N9mr0OCZKOO6C+cnFsFwdoWtLuuc6S1wCBmyWYFQISgdFJ/oz51yD00uD+yJhKNxvAZbNFt8XH1jHTX5tYCNaeLavQQa0hWVpNNtCD4= 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 1628617803416319.2693052931479; Tue, 10 Aug 2021 10:50:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-iAtNNdP0N5SFJL4ugUHasw-1; Tue, 10 Aug 2021 13:45:41 -0400 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 5D4F1100A624; Tue, 10 Aug 2021 17:45:31 +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 388A110016FB; Tue, 10 Aug 2021 17:45: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 0758A4A709; Tue, 10 Aug 2021 17:45:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17AHjO0O025765 for ; Tue, 10 Aug 2021 13:45:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 64E12620DE; Tue, 10 Aug 2021 17:45:24 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2C7B6E0B7 for ; Tue, 10 Aug 2021 17:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628617802; 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=LkeN7EsBn5pxlH3mJug52ruCIGDNd/Wh6RNUSuIG4r0=; b=IyRPuoc2l1v7/T/eXJrLYzh5ytRuJJZHdyVBIgrrDK5oHHIxYQlvcXUoSgHhwO+gUKJaes YLV7T2L85/ObFDmw6ovvxnHR2iEgR3gRrab6spc4SM8ULO5xsAmU8c6KUS/YFAFolJNQnz d8T5mX8OOqGB5YphlVFG7qRCQ59B3rE= X-MC-Unique: iAtNNdP0N5SFJL4ugUHasw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] virsh: checkpoint: use g_auto where possible Date: Tue, 10 Aug 2021 19:45:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628617804163100001 Signed-off-by: J=C3=A1n Tomko --- tools/virsh-checkpoint.c | 78 +++++++++++++--------------------------- 1 file changed, 24 insertions(+), 54 deletions(-) diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 9e942a226b..5c1d25ecf8 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -47,7 +47,7 @@ virshCheckpointCreate(vshControl *ctl, const char *from) { bool ret =3D false; - virDomainCheckpointPtr checkpoint; + g_autoptr(virshDomainCheckpoint) checkpoint =3D NULL; const char *name =3D NULL; =20 checkpoint =3D virDomainCheckpointCreateXML(dom, buffer, flags); @@ -70,7 +70,6 @@ virshCheckpointCreate(vshControl *ctl, ret =3D true; =20 cleanup: - virshDomainCheckpointFree(checkpoint); return ret; } =20 @@ -114,10 +113,10 @@ static bool cmdCheckpointCreate(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; bool ret =3D false; const char *from =3D NULL; - char *buffer =3D NULL; + g_autofree char *buffer =3D NULL; unsigned int flags =3D 0; =20 VSH_REQUIRE_OPTION("redefine-validate", "redefine"); @@ -146,9 +145,6 @@ cmdCheckpointCreate(vshControl *ctl, ret =3D virshCheckpointCreate(ctl, dom, buffer, flags, from); =20 cleanup: - VIR_FREE(buffer); - virshDomainFree(dom); - return ret; } =20 @@ -165,7 +161,7 @@ virshParseCheckpointDiskspec(vshControl *ctl, const char *name =3D NULL; const char *checkpoint =3D NULL; const char *bitmap =3D NULL; - char **array =3D NULL; + g_auto(GStrv) array =3D NULL; int narray; size_t i; =20 @@ -193,7 +189,6 @@ virshParseCheckpointDiskspec(vshControl *ctl, cleanup: if (ret < 0) vshError(ctl, _("unable to parse diskspec: %s"), str); - g_strfreev(array); return ret; } =20 @@ -238,9 +233,9 @@ static bool cmdCheckpointCreateAs(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; bool ret =3D false; - char *buffer =3D NULL; + g_autofree char *buffer =3D NULL; const char *name =3D NULL; const char *desc =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -286,9 +281,6 @@ cmdCheckpointCreateAs(vshControl *ctl, ret =3D virshCheckpointCreate(ctl, dom, buffer, flags, NULL); =20 cleanup: - VIR_FREE(buffer); - virshDomainFree(dom); - return ret; } =20 @@ -353,9 +345,9 @@ static bool cmdCheckpointEdit(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; - virDomainCheckpointPtr checkpoint =3D NULL; - virDomainCheckpointPtr edited =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; + g_autoptr(virshDomainCheckpoint) checkpoint =3D NULL; + g_autoptr(virshDomainCheckpoint) edited =3D NULL; const char *name =3D NULL; const char *edited_name; bool ret =3D false; @@ -404,9 +396,6 @@ cmdCheckpointEdit(vshControl *ctl, cleanup: if (!ret && name) vshError(ctl, _("Failed to update %s"), name); - virshDomainCheckpointFree(edited); - virshDomainCheckpointFree(checkpoint); - virshDomainFree(dom); return ret; } =20 @@ -420,7 +409,7 @@ virshGetCheckpointParent(vshControl *ctl, virDomainCheckpointPtr checkpoint, char **parent_name) { - virDomainCheckpointPtr parent =3D NULL; + g_autoptr(virshDomainCheckpoint) parent =3D NULL; int ret =3D -1; =20 *parent_name =3D NULL; @@ -441,7 +430,6 @@ virshGetCheckpointParent(vshControl *ctl, } else { vshResetLibvirtError(); } - virshDomainCheckpointFree(parent); return ret; } =20 @@ -474,10 +462,10 @@ static bool cmdCheckpointInfo(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; - virDomainCheckpointPtr checkpoint =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; + g_autoptr(virshDomainCheckpoint) checkpoint =3D NULL; const char *name; - char *parent =3D NULL; + g_autofree char *parent =3D NULL; bool ret =3D false; int count; unsigned int flags; @@ -520,9 +508,6 @@ cmdCheckpointInfo(vshControl *ctl, ret =3D true; =20 cleanup: - VIR_FREE(parent); - virshDomainCheckpointFree(checkpoint); - virshDomainFree(dom); return ret; } =20 @@ -708,7 +693,7 @@ static bool cmdCheckpointList(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; bool ret =3D false; unsigned int flags =3D 0; size_t i; @@ -721,9 +706,9 @@ cmdCheckpointList(vshControl *ctl, bool parent =3D vshCommandOptBool(cmd, "parent"); bool roots =3D vshCommandOptBool(cmd, "roots"); const char *from_chk =3D NULL; - virDomainCheckpointPtr start =3D NULL; + g_autoptr(virshDomainCheckpoint) start =3D NULL; struct virshCheckpointList *checkpointlist =3D NULL; - vshTable *table =3D NULL; + g_autoptr(vshTable) table =3D NULL; =20 VSH_EXCLUSIVE_OPTIONS_VAR(tree, name); VSH_EXCLUSIVE_OPTIONS_VAR(parent, roots); @@ -847,10 +832,6 @@ cmdCheckpointList(vshControl *ctl, =20 cleanup: virshCheckpointListFree(checkpointlist); - virshDomainCheckpointFree(start); - virshDomainFree(dom); - vshTableFree(table); - return ret; } =20 @@ -894,11 +875,11 @@ static bool cmdCheckpointDumpXML(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; bool ret =3D false; const char *name =3D NULL; - virDomainCheckpointPtr checkpoint =3D NULL; - char *xml =3D NULL; + g_autoptr(virshDomainCheckpoint) checkpoint =3D NULL; + g_autofree char *xml =3D NULL; unsigned int flags =3D 0; =20 if (vshCommandOptBool(cmd, "security-info")) @@ -922,10 +903,6 @@ cmdCheckpointDumpXML(vshControl *ctl, ret =3D true; =20 cleanup: - VIR_FREE(xml); - virshDomainCheckpointFree(checkpoint); - virshDomainFree(dom); - return ret; } =20 @@ -957,11 +934,11 @@ static bool cmdCheckpointParent(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; bool ret =3D false; const char *name =3D NULL; - virDomainCheckpointPtr checkpoint =3D NULL; - char *parent =3D NULL; + g_autoptr(virshDomainCheckpoint) checkpoint =3D NULL; + g_autofree char *parent =3D NULL; =20 dom =3D virshCommandOptDomain(ctl, cmd, NULL); if (dom =3D=3D NULL) @@ -983,10 +960,6 @@ cmdCheckpointParent(vshControl *ctl, ret =3D true; =20 cleanup: - VIR_FREE(parent); - virshDomainCheckpointFree(checkpoint); - virshDomainFree(dom); - return ret; } =20 @@ -1031,10 +1004,10 @@ static bool cmdCheckpointDelete(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom =3D NULL; + g_autoptr(virshDomain) dom =3D NULL; bool ret =3D false; const char *name =3D NULL; - virDomainCheckpointPtr checkpoint =3D NULL; + g_autoptr(virshDomainCheckpoint) checkpoint =3D NULL; unsigned int flags =3D 0; =20 dom =3D virshCommandOptDomain(ctl, cmd, NULL); @@ -1065,9 +1038,6 @@ cmdCheckpointDelete(vshControl *ctl, ret =3D true; =20 cleanup: - virshDomainCheckpointFree(checkpoint); - virshDomainFree(dom); - return ret; } =20 --=20 2.31.1