From nobody Thu May 16 22:37:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585914812; cv=none; d=zohomail.com; s=zohoarc; b=DyBCTiOtcCk+QP9mdfYWRW32UECNjlxXQRCYCckTugljv/4XVP+9xwoXtBuO8GDP4aQ+zAIUt5azU6B4NC1JPM6Zvyu/V7nAkLa8W28a0nBAnLLjrAZAKpKlthqB70LQ0yvDqjn6rGjJM6waLFPSfoFvuzmS6Bo/+q+HDEGxbzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585914812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=mEaeWeuSdOAGLQFky4sxSCRdAzH2vUXl6yDi/shRaDs=; b=g2P41SjyPPXIFnqQu17r3T0FpZCaAv6jeXeRhf8906fYOCgDQSoIgdtV4wsqoWqK7dxEIO7yDYK2UVgEhH5U/7/EQHoYdioHLlhDffdzpaC48ONgyPLt2B+RH9h/ieT5biTeBYBaE+EYaCuS5Kl+Ki788yZwr8CP3A4ot76i6ss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 15859148120664.717557836834544; Fri, 3 Apr 2020 04:53:32 -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-389-pExEvDwPOlyYUBr4baTtkQ-1; Fri, 03 Apr 2020 07:53:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 291888017F6; Fri, 3 Apr 2020 11:53:22 +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 28DE85C1B0; Fri, 3 Apr 2020 11:53: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 B19784E444; Fri, 3 Apr 2020 11:53:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 033BrE6R013145 for ; Fri, 3 Apr 2020 07:53:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 818C12166B2E; Fri, 3 Apr 2020 11:53:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D9552166B2C for ; Fri, 3 Apr 2020 11:53:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FAD68FF67C for ; Fri, 3 Apr 2020 11:53:12 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-456-Mv56yjUFMRueK7tFhRUmyQ-1; Fri, 03 Apr 2020 07:53:09 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 033BXG9E034532 for ; Fri, 3 Apr 2020 07:53:09 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 305emfw2pt-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 03 Apr 2020 07:53:09 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Apr 2020 12:52:50 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 3 Apr 2020 12:52:48 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 033Br4C154722806 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Apr 2020 11:53:04 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9B90AA405F; Fri, 3 Apr 2020 11:53:04 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC908A4054; Fri, 3 Apr 2020 11:53:03 +0000 (GMT) Received: from oc2388111647.ibm.com (unknown [9.85.69.18]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Fri, 3 Apr 2020 11:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585914810; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mEaeWeuSdOAGLQFky4sxSCRdAzH2vUXl6yDi/shRaDs=; b=JtAGvNi+MesUdj9hL1jb/OanfbEcAXMN1nX1Sv5uR1g2wAYuzNIShb7RtCyJnT5S55ALCq Tx9UGy0za/8uMYrlfsXowrBRtRt2t7WLODB4XQ4TKDADWiuiIqUMzFQ4RaJTCouPtQZlOX XpvProxNOfRrzl2eBtVLT9A+qtVkyGI= X-MC-Unique: pExEvDwPOlyYUBr4baTtkQ-1 X-MC-Unique: Mv56yjUFMRueK7tFhRUmyQ-1 From: Seeteena Thoufeek To: libvir-list@redhat.com Subject: [PATCH] qemu_checkpoint.c: Use g_autofree in qemuCheckpointPrepare() Date: Fri, 3 Apr 2020 17:22:58 +0530 X-TM-AS-GCONF: 00 x-cbid: 20040311-0016-0000-0000-000002FD8F5E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20040311-0017-0000-0000-000033615DD0 Message-Id: <1585914778-2241-1-git-send-email-s1seetee@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-03_07:2020-04-02, 2020-04-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 suspectscore=4 mlxlogscore=766 priorityscore=1501 lowpriorityscore=0 clxscore=1015 phishscore=0 malwarescore=0 bulkscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004030097 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033BrE6R013145 X-loop: libvir-list@redhat.com Cc: s1seetee@linux.vnet.ibm.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.79 on 10.5.11.16 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is the only instance of g_autofree change applicable for qemu_checkpoint.c Signed-off-by: Seeteena Thoufeek Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_checkpoint.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 3a510c9..ccd10cb 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -405,9 +405,8 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainCheckpointDefPtr def) { - int ret =3D -1; size_t i; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 /* Easiest way to clone inactive portion of vm->def is via @@ -419,10 +418,10 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver, priv->qemuCaps, VIR_DOMAIN_DEF_PARSE_I= NACTIVE | VIR_DOMAIN_DEF_PARSE_S= KIP_VALIDATE))) - goto cleanup; + return -1; =20 if (virDomainCheckpointAlignDisks(def) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < def->ndisks; i++) { virDomainCheckpointDiskDefPtr disk =3D &def->disks[i]; @@ -434,7 +433,7 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("bitmap for disk '%s' must match checkpoint n= ame '%s'"), disk->name, def->parent.name); - goto cleanup; + return -1; } =20 if (vm->def->disks[i]->src->format !=3D VIR_STORAGE_FILE_QCOW2) { @@ -444,15 +443,11 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver, disk->name, virStorageFileFormatTypeToString( vm->def->disks[i]->src->format)); - goto cleanup; + return -1; } } =20 - ret =3D 0; - - cleanup: - VIR_FREE(xml); - return ret; + return 0; } =20 static int --=20 1.8.3.1