From nobody Fri Dec 19 17:38:35 2025 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=1619013960; cv=none; d=zohomail.com; s=zohoarc; b=cpIVKuFUrb2YYRubC7FnoiQPuzXn8oRZU1BF0YmTrwz7GTh4xdbDNVEC19RpjbJTQL2fBLgbnkNw0+ptj1ht8pFfp1alyVt/Tx1AUS1JAMuiJVShHYWYlLy4rE7jTqb6L13FVN29fwZT8dS9dtX30BUrD+3hrbQUr8bD60SyQpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619013960; 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=O5kU42nhopgopepEZmohv8exgvuqEubtFbiCEfJgtJw=; b=iYI8Ljxh+OLYJhaEP/sKV6Do4iCqiCe1FSz3jKABqPcUD6TvcM4nATMHS1c9qTGCHvdHxqZ4UVikNM5PX+dtHsZ9yERM0XQLlo/IfeRW8rp6Qt+UhuVbCgxji1dep+1QroOs+jkabpLEIbppR4uTCV4a/wfLV8J6mUIjFKvFYCs= 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) header.from= 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 1619013960026103.24049632842434; Wed, 21 Apr 2021 07:06:00 -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-324-6y-axJn-NrSdaEmaXARGJQ-1; Wed, 21 Apr 2021 10:05:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8303100807C; Wed, 21 Apr 2021 14:04:58 +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 A584718E59; Wed, 21 Apr 2021 14:04:58 +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 618DE1806D1B; Wed, 21 Apr 2021 14:04:58 +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 13LE4liJ023965 for ; Wed, 21 Apr 2021 10:04:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id A70D660938; Wed, 21 Apr 2021 14:04:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40D116091B for ; Wed, 21 Apr 2021 14:04:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619013958; 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=O5kU42nhopgopepEZmohv8exgvuqEubtFbiCEfJgtJw=; b=LCXy7No/GPoegECLG/Imn1++nSioM4lYwLQqw01N+loZvFNgupsr6ISd6UZg/phzmNMFRs XpLEbu85DeHu6BztuYm7NDZAiHaSvr8C2oRTtckqx7dvLdXQUwcOMBUxutt2eR9ExNjHCb 6tTa5jolEHDu/aBLeEHUCJ/wsUrYacs= X-MC-Unique: 6y-axJn-NrSdaEmaXARGJQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/10] qemuMonitorJSONBlockJobCancel: Refactor cleanup Date: Wed, 21 Apr 2021 16:04:32 +0200 Message-Id: <62a0f1993b3c85f4d0814b34e707414591cba9c0.1619013793.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 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.23 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) Content-Type: text/plain; charset="utf-8" Use automatic memory freeing and remove the cleanup section. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 652034472a..8f3ccb0c63 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5219,9 +5219,8 @@ int qemuMonitorJSONBlockJobCancel(qemuMonitor *mon, const char *jobname) { - int ret =3D -1; - virJSONValue *cmd =3D NULL; - virJSONValue *reply =3D NULL; + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; if (!(cmd =3D qemuMonitorJSONMakeCommand("block-job-cancel", "s:device", jobname, @@ -5229,17 +5228,12 @@ qemuMonitorJSONBlockJobCancel(qemuMonitor *mon, return -1; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + return -1; if (qemuMonitorJSONBlockJobError(cmd, reply, jobname) < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; + return 0; } --=20 2.30.2