From nobody Mon Feb 9 20:35:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1613152652; cv=none; d=zohomail.com; s=zohoarc; b=kWLIGJObzgeLKvyPFFpOJnvWdc42Eo47B+hznhXdWIRnS2p/KEElLA/v9KSRcfZsX2X2wnMdTf7Ku9XE/2QqMCFP065qX9yjebrzgxfkaTF9+Azr476p/WuarhTTETwv5/DsD8pzC4EtWcLvWLyydtO0HAq/HtkpJvS90l5uqlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613152652; 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=bzi1pcB+tODVQdEXuu/fsAFdFq7hcM2ptyZBJcsFJKU=; b=Kch5yVyaLiocdxrEhG1/SKpFVFxcwcl21r7tKcwwbYC8nu8ojuHMFzGj9GzjUV6TdwOnFqMliOBPJW3jTfpAxol8/FHbnWi8ce5SePQux6Zb0KQvpgJ51BJ6Tul81jAHRK6hXtlTT+xkNKnRURGHis+qh3epKhwFBx7cCmY10ps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1613152652982645.4697185178147; Fri, 12 Feb 2021 09:57:32 -0800 (PST) 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-425-fZ8QSTblMQ6GhP6kqhcKVw-1; Fri, 12 Feb 2021 12:57:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90DC2102C809; Fri, 12 Feb 2021 17:56:57 +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 6E7E86B8E5; Fri, 12 Feb 2021 17:56:57 +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 3624618095CE; Fri, 12 Feb 2021 17:56:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11CHukhr011000 for ; Fri, 12 Feb 2021 12:56:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id C26345C3E0; Fri, 12 Feb 2021 17:56:46 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FDE418813 for ; Fri, 12 Feb 2021 17:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613152651; 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=bzi1pcB+tODVQdEXuu/fsAFdFq7hcM2ptyZBJcsFJKU=; b=IqFeGAvHer5WTrSktGE9wvU6jD+bOXG0iL6WoLJBpNC+mSaFlSzue4hrNr4Fh9cA5/441h ++VQtzm3dk2R3zvIjBy+zWBKnHY8mzOLcaafXiImIGQdrKQ6MRk+f5FQDFC7UkdudCfAJR DsQow14xIxlh5ONhhfH1HLDfvTIAG8o= X-MC-Unique: fZ8QSTblMQ6GhP6kqhcKVw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 21/25] qemuMonitorJSONTransactionAdd: Refactor cleanup Date: Fri, 12 Feb 2021 18:55:34 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.79 on 10.5.11.13 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" Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 94365c775b..76401c4d3c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -510,31 +510,28 @@ qemuMonitorJSONTransactionAdd(virJSONValuePtr actions, const char *cmdname, ...) { - virJSONValuePtr entry =3D NULL; - virJSONValuePtr data =3D NULL; + g_autoptr(virJSONValue) entry =3D NULL; + g_autoptr(virJSONValue) data =3D NULL; va_list args; - int ret =3D -1; va_start(args, cmdname); - if (virJSONValueObjectCreateVArgs(&data, args) < 0) - goto cleanup; + if (virJSONValueObjectCreateVArgs(&data, args) < 0) { + va_end(args); + return -1; + } + + va_end(args); if (virJSONValueObjectCreate(&entry, "s:type", cmdname, "A:data", &data, NULL) < 0) - goto cleanup; + return -1; if (virJSONValueArrayAppend(actions, &entry) < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - virJSONValueFree(entry); - virJSONValueFree(data); - va_end(args); - return ret; + return 0; } --=20 2.29.2