From nobody Mon Feb 9 07:11:23 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=1669912303; cv=none; d=zohomail.com; s=zohoarc; b=kGPfIOoegzuFdU0SwIsoib+Rv8xvJbv6nDYEaRZj67XcZ/D+MWxpP+mo1rOSv6xHMUiCDIakehYLdkc2ut9CtX/Z8wKiLVOVWye9S/S11KvgbfRUlzjsjWRtQyYAeqfBoTAg6Ing3hHODFF6BBcr4XCqtAsx3tiSQvrwFA0iU2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669912303; 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=7xyr53SMIxDHvOCmvHFroq0Tt0v1zlY8RYfjUKYkiwI=; b=mYN+af6c66J6bH8zNlKo8ohZM67epZIu4JPaQHJlMBfkRMO4N//B6Nnsr2+0ZK1YCcZda9+Dp/lNlZJABXtwimLusNfSxzaoWioqQnVOH2acGUtz5DS1biOc1naDR++Py9g13FCrCpSlWrexoKvVA0IljbPwDwu1bWjWjcK7UQI= 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 1669912303726578.4166808296002; Thu, 1 Dec 2022 08:31:43 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-340-kzitF536NqK7nlKMVZOYpA-1; Thu, 01 Dec 2022 11:31:39 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9404B1C0050C; Thu, 1 Dec 2022 16:31:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74D8D1401C39; Thu, 1 Dec 2022 16:31:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0638419465B1; Thu, 1 Dec 2022 16:31:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B116719465A8 for ; Thu, 1 Dec 2022 16:31:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 84406C1908C; Thu, 1 Dec 2022 16:31:21 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-20.brq.redhat.com [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7844FC15BB4 for ; Thu, 1 Dec 2022 16:31:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669912302; 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=7xyr53SMIxDHvOCmvHFroq0Tt0v1zlY8RYfjUKYkiwI=; b=fPUJklA5wk+Bln1G6uN5IIaYBI58Tp/Nl2DTtgLNpG201tLIVXzYGNnCB4lgqr19AuyLBd oKBPnJQ7CIj3EYaE2FmoMFYFe3+IBWWN21oJ4SNIiqOD8B7fV2ABjI4JjfET9cgcJEsoCA Wt+T4H/WgNbMRsROH95Fq3BLbEZYBEM= X-MC-Unique: kzitF536NqK7nlKMVZOYpA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/12] qemu: monitor: Use qemuMonitorJSONGetReply for VIR_JSON_TYPE_ARRAY Date: Thu, 1 Dec 2022 17:31:07 +0100 Message-Id: <838ebea11721b326e0e374f638707c0947c084c7.1669912195.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1669912304959100001 Content-Type: text/plain; charset="utf-8" Replace usage of the following pattern with the new helper: if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) return -1; data =3D virJSONValueObjectGetArray(reply, "return"); Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 48 +++++++++++------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e3fe068c1b..79729e0a9a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4702,10 +4702,9 @@ int qemuMonitorJSONGetMachines(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) goto cleanup; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); /* null-terminated list */ @@ -4830,10 +4829,9 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitor *mon, if (qemuMonitorJSONHasError(reply, "GenericError")) return 0; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); ncpus =3D virJSONValueArraySize(data); if (!(defs =3D qemuMonitorCPUDefsNew(ncpus))) @@ -5214,10 +5212,9 @@ int qemuMonitorJSONGetCommands(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return -1; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); /* null-terminated list */ @@ -5339,10 +5336,9 @@ qemuMonitorJSONGetObjectTypes(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return -1; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); /* null-terminated list */ @@ -5388,10 +5384,9 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitor *m= on, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) goto cleanup; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); /* null-terminated list */ @@ -5620,10 +5615,9 @@ qemuMonitorJSONParsePropsList(virJSONValue *cmd, size_t count =3D 0; size_t i; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); /* null-terminated list */ @@ -5776,10 +5770,9 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitor = *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return -1; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(caps =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - caps =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(caps); list =3D g_new0(char *, n + 1); @@ -5871,10 +5864,9 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitor *mon, if (qemuMonitorJSONHasError(reply, "CommandNotFound")) return 0; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(caps =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - caps =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(caps); /* If the returned array was empty we have to return successfully */ @@ -6754,10 +6746,9 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return -1; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); if (!(*cpudata =3D qemuMonitorJSONParseCPUx86Features(data))) return -1; @@ -6795,10 +6786,9 @@ qemuMonitorJSONCheckCPUx86(qemuMonitor *mon, } } - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); for (i =3D 0; i < n; i++) { @@ -7031,10 +7021,9 @@ qemuMonitorJSONGetIOThreads(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) goto cleanup; - data =3D virJSONValueObjectGetArray(reply, "return"); n =3D virJSONValueArraySize(data); /* null-terminated list */ @@ -7174,11 +7163,9 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return -1; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); - for (i =3D 0; i < virJSONValueArraySize(data); i++) { virJSONValue *elem =3D virJSONValueArrayGet(data, i); g_autofree qemuMonitorMemoryDeviceInfo *meminfo =3D NULL; @@ -7659,10 +7646,9 @@ qemuMonitorJSONGetHotpluggableCPUs(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) goto cleanup; - data =3D virJSONValueObjectGet(reply, "return"); ninfo =3D virJSONValueArraySize(data); info =3D g_new0(struct qemuMonitorQueryHotpluggableCpusEntry, ninfo); @@ -8372,11 +8358,9 @@ qemuMonitorJSONGetJobInfo(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return -1; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) return -1; - data =3D virJSONValueObjectGetArray(reply, "return"); - for (i =3D 0; i < virJSONValueArraySize(data); i++) { qemuMonitorJobInfo *job =3D NULL; @@ -8783,11 +8767,9 @@ qemuMonitorJSONQueryStatsSchema(qemuMonitor *mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) return NULL; - if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) + if (!(ret =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY)= )) return NULL; - ret =3D virJSONValueObjectGetArray(reply, "return"); - return qemuMonitorJSONExtractQueryStatsSchema(ret); } --=20 2.38.1