From nobody Mon Feb 9 14:33:47 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=1626688595; cv=none; d=zohomail.com; s=zohoarc; b=k9+MzNzwMUOIpzTsJ46QhZvZe8eJkyF2dl8iJl8H59R31E2UVqedDF8URQUWwvqjn5BJGr9pnOF+S/xflqk26kdgIpHbQmzUXOKzqDNiIusrMCFU6Vg3fKTcCPTHEK2y4QOE9LIo7RKvD5CyCof4MjnALSJtc4kLIaN1jJxH3Kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626688595; h=Content-Type:Content-Transfer-Encoding:Cc: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=yZC61/dPkojUyCjH2jff+XU/75QVWWmsO0a2pqRgcxo=; b=jJEYPeftrox3bz6//ciVRyLE0E72meQxkDgigmUtZYy/qw+bHg0s5rQxjZUqt2y3rDTyUO8fiFvX30zGVjp7Q269CiU295zi/ggEwF4G69OCs0WJECqxz4l49fWxfCUYP0OSX8U5AJK4j+6ZexI6VkQuTtlX73HOimZXZi414kI= 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) 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 1626688595249180.69298185560456; Mon, 19 Jul 2021 02:56:35 -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-265-ObJ2s_LvMf-91OiIsrQvsg-1; Mon, 19 Jul 2021 05:56:32 -0400 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 7986B624; Mon, 19 Jul 2021 09:56:27 +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 5DCA160877; Mon, 19 Jul 2021 09:56:27 +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 27A151809CB2; Mon, 19 Jul 2021 09:56:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16J9u64b002616 for ; Mon, 19 Jul 2021 05:56:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id E24EC10074E1; Mon, 19 Jul 2021 09:56:06 +0000 (UTC) Received: from work.redhat.com (ovpn-113-143.ams2.redhat.com [10.36.113.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3878410016F2; Mon, 19 Jul 2021 09:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626688594; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=yZC61/dPkojUyCjH2jff+XU/75QVWWmsO0a2pqRgcxo=; b=SHZI38f/xrDvRTM+I3J4nAZt4XSmjwUn3llrGFlbe/C8kVNit8m0P8o1o9G0dfZAjrHLp0 YfaMW7jDloIhBJJxKxSSsEPEBEAxwqzoP7v8FdS8jOijsC2uqa1rlEz4WKjxbZmxv9idxS Qm+Za1bB1krPd03VIjNAz/WsUd3rqjU= X-MC-Unique: ObJ2s_LvMf-91OiIsrQvsg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] qemuMonitorJSONGetAllBlockJobInfo: Remove superfluous `goto`s Date: Mon, 19 Jul 2021 11:55:51 +0200 Message-Id: <20210719095554.26137-8-twiederh@redhat.com> In-Reply-To: <20210719095554.26137-1-twiederh@redhat.com> References: <20210719095554.26137-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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) X-ZM-MESSAGEID: 1626688596744100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/qemu/qemu_monitor_json.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 59c5eedb0a..7e53e0ce84 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5074,39 +5074,34 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon, virJSONValue *data; size_t nr_results; size_t i; - g_autoptr(GHashTable) blockJobs =3D NULL; + g_autoptr(GHashTable) blockJobs =3D virHashNew(g_free); =20 cmd =3D qemuMonitorJSONMakeCommand("query-block-jobs", NULL); if (!cmd) return NULL; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + return NULL; =20 if ((data =3D virJSONValueObjectGetArray(reply, "return")) =3D=3D NULL= ) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("reply was missing return data")); - goto cleanup; + return NULL; } =20 nr_results =3D virJSONValueArraySize(data); - blockJobs =3D virHashNew(g_free); =20 for (i =3D 0; i < nr_results; i++) { virJSONValue *entry =3D virJSONValueArrayGet(data, i); if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing array element")); - goto error; + return NULL; } if (qemuMonitorJSONParseBlockJobInfo(blockJobs, entry, rawjobname)= < 0) - goto error; + return NULL; } =20 - cleanup: return g_steal_pointer(&blockJobs); - - error: - return NULL; } =20 =20 --=20 2.31.1