From nobody Mon Feb 9 03:29:10 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=1633622332; cv=none; d=zohomail.com; s=zohoarc; b=d+PcXDTJ9sjlAQsyj+bflsShE697ZPm2MTahRY37EgMWrPxf3wSyFFaTVcbfxd4CER1tSJOvKVlMGREsS0sFq6MWef+6APNwIFfye41sLdssSukQgoO2ROTfT1HNve3o16qdj3Nb4mJnKiSZRvy/5ILfEj7H5JNEWHb/x1K9iwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633622332; 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=UqauVpIEU42CXc3ZBZofDb8oOuw2dBtMat2yZrXmG7A=; b=I37SLtiVwQmLW/rc0Wc8su2PgRMNm1y3AD1t6VbmcPdkRxN+PxeZqt3exdOKA0U9VZhgT28BzVQsnx6UvcIfyz25B2zPaIZyTqpRaYTy3xhfzsFfTSCfOUeccifz4XYkX2ljX7M+O7wEM2nBSnenXGIo3Ec3gOsX9HR5b2EebjU= 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 1633622332380466.1473807433241; Thu, 7 Oct 2021 08:58:52 -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-556-CNrpyHM4PbuSFXPxj186ow-1; Thu, 07 Oct 2021 11:58:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 128C593A291; Thu, 7 Oct 2021 15:50:04 +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 BB0B4219B62; Thu, 7 Oct 2021 15:49:29 +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 831BB1800B8B; Thu, 7 Oct 2021 15:49:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FJ1PJ023762 for ; Thu, 7 Oct 2021 11:19:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id B2F135D740; Thu, 7 Oct 2021 15:19:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D1F05D6BA for ; Thu, 7 Oct 2021 15:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633622331; 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=UqauVpIEU42CXc3ZBZofDb8oOuw2dBtMat2yZrXmG7A=; b=dvaZ07qa+tbBzC+4QYefth+7lTS9G+aBfTJFCayJAGNB0xPmVPkEI5DS6jc7Z3WGB5VDc7 5YDrq1Qo0PjEqIfviufQFMg0jxy3hBCEkv602FUZyUkWm6HB4trKPxMF/7HytsnqGdTRNT 53PLGpR1dyb3vYAaZ9Sm/jUaa06Vbd0= X-MC-Unique: CNrpyHM4PbuSFXPxj186ow-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 026/103] qemuMonitorJSONAddDeviceProps: Refactor cleanup Date: Thu, 7 Oct 2021 17:17:14 +0200 Message-Id: <86e20fa42b52613e8b97e73efa86ff829f75adf4.1633619630.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.15 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) X-ZM-MESSAGEID: 1633622334279100001 Content-Type: text/plain; charset="utf-8" Use automatic memory freeing and remove 'ret' variable and 'cleanup' label. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e5c71f58c2..f831cfeeb5 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4557,27 +4557,22 @@ int qemuMonitorJSONAddDeviceProps(qemuMonitor *mon, virJSONValue **props) { - 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("device_add", NULL))) - goto cleanup; + return -1; if (virJSONValueObjectAppend(cmd, "arguments", props) < 0) - goto cleanup; + return -1; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + return -1; if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; + return -1; - ret =3D 0; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; + return 0; } --=20 2.31.1