From nobody Sun Feb 8 16:30:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1572960724; cv=none; d=zoho.com; s=zohoarc; b=cGSd/D6QwlHjuG6AubD4dnyDI08E4hrj2ahlQU1chzt+TaUJieE5j07MSEWZexi0DNCHMPH3h7joMWAAhiKPBpns0LEtkwJIPXczlMLiKnkymh5kzXQfSh39dbkmwvXCSgimLBS6Uc2SzFulNMikWsoNUMEk6E+eHTAndoF2w1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960724; 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=M1VMuH1Q5eeOgjahiUj1xAa/d5S9MVqMdtPRkAO8Dz4=; b=oNvVDJzDDMXmtFz1Ma5WSRX5044+xJrajylXSlUNdubrTJy3Y3ix5fy6AudGNrbHcb02Sk4ccUrtcyUICiqi4f6jwN7kcs/dVgUE8ooWuxALgWrwRuvXP28sWg2TTsBbrnOTpyywYWkMX7WiZItBRVoPyZ8HvDnFNcIIqHvstq0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1572960723996425.64261657046757; Tue, 5 Nov 2019 05:32:03 -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-378-a5yXU-5sNFyV8uahYAivxg-1; Tue, 05 Nov 2019 08:28:55 -0500 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 AB924808245; Tue, 5 Nov 2019 13:28:47 +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 7E08D5D70D; Tue, 5 Nov 2019 13:28:47 +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 2FE0B18033C7; Tue, 5 Nov 2019 13:28:47 +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 xA5DS0NI003981 for ; Tue, 5 Nov 2019 08:28:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7C2A81001B32; Tue, 5 Nov 2019 13:28:00 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D8741001902 for ; Tue, 5 Nov 2019 13:27:57 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 82B19105B28; Tue, 5 Nov 2019 14:27:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572960723; 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=M1VMuH1Q5eeOgjahiUj1xAa/d5S9MVqMdtPRkAO8Dz4=; b=ieM88HM2Cpe6NKHRkysdBUvN80gwe7q88j4Y1GmW+pvGMdVTgoPrNWroNnBiiPnKm2rO1/ JCTNr2QExH/VrPrezGLigMSUogqlUpqPfTaeY62ghWDW82t60dTI6PE2pYfciQGtITnRYL Dr+7/eH6+mtf4+81INlx+3j7N7vRxSU= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:09 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 11/52] qemu: Flatten qemuMonitorCPUDefs.cpus 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 X-MC-Unique: a5yXU-5sNFyV8uahYAivxg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Let's store qemuMonitorCPUDefInfo directly in the array of CPUs in qemuMonitorCPUDefs rather then using an array of pointers. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 2: - trivial rebase =20 Version 3: - minor change caused by g_new0 introduced in v3 of the previous patch src/qemu/qemu_capabilities.c | 14 +++++++------- src/qemu/qemu_monitor.c | 7 +++---- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 7 +------ tests/qemumonitorjsontest.c | 8 ++++---- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e8b857b8cf..af51a701b1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2473,11 +2473,11 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, =20 for (name =3D libvirtModels; name && *name; name++) { for (i =3D 0; i < defs->ncpus; i++) { - if (STRCASENEQ(defs->cpus[i]->name, *name)) + if (STRCASENEQ(defs->cpus[i].name, *name)) continue; =20 - VIR_FREE(defs->cpus[i]->name); - defs->cpus[i]->name =3D g_strdup(*name); + VIR_FREE(defs->cpus[i].name); + defs->cpus[i].name =3D g_strdup(*name); } } } @@ -2488,13 +2488,13 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, for (i =3D 0; i < defs->ncpus; i++) { virDomainCapsCPUUsable usable =3D VIR_DOMCAPS_CPU_USABLE_UNKNOWN; =20 - if (defs->cpus[i]->usable =3D=3D VIR_TRISTATE_BOOL_YES) + if (defs->cpus[i].usable =3D=3D VIR_TRISTATE_BOOL_YES) usable =3D VIR_DOMCAPS_CPU_USABLE_YES; - else if (defs->cpus[i]->usable =3D=3D VIR_TRISTATE_BOOL_NO) + else if (defs->cpus[i].usable =3D=3D VIR_TRISTATE_BOOL_NO) usable =3D VIR_DOMCAPS_CPU_USABLE_NO; =20 - if (virDomainCapsCPUModelsAddSteal(models, &defs->cpus[i]->name, u= sable, - &defs->cpus[i]->blockers) < 0) + if (virDomainCapsCPUModelsAddSteal(models, &defs->cpus[i].name, us= able, + &defs->cpus[i].blockers) < 0) goto cleanup; } =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 44c8ba2adb..f906472cd1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3572,9 +3572,8 @@ qemuMonitorCPUDefsFree(qemuMonitorCPUDefsPtr defs) return; =20 for (i =3D 0; i < defs->ncpus; i++) { - g_strfreev(defs->cpus[i]->blockers); - g_free(defs->cpus[i]->name); - g_free(defs->cpus[i]); + g_strfreev(defs->cpus[i].blockers); + g_free(defs->cpus[i].name); } =20 g_free(defs->cpus); @@ -3588,7 +3587,7 @@ qemuMonitorCPUDefsNew(size_t count) g_autoptr(qemuMonitorCPUDefs) defs =3D NULL; =20 defs =3D g_new0(qemuMonitorCPUDefs, 1); - defs->cpus =3D g_new0(qemuMonitorCPUDefInfoPtr, count); + defs->cpus =3D g_new0(qemuMonitorCPUDefInfo, count); defs->ncpus =3D count; =20 return g_steal_pointer(&defs); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 00f4dd437f..f275e910cf 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1116,7 +1116,7 @@ typedef struct _qemuMonitorCPUDefs qemuMonitorCPUDefs; typedef qemuMonitorCPUDefs *qemuMonitorCPUDefsPtr; struct _qemuMonitorCPUDefs { size_t ncpus; - qemuMonitorCPUDefInfoPtr *cpus; + qemuMonitorCPUDefInfoPtr cpus; }; =20 int qemuMonitorGetCPUDefinitions(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8f04be79c1..a6cf70c70a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5611,12 +5611,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, for (i =3D 0; i < defs->ncpus; i++) { virJSONValuePtr child =3D virJSONValueArrayGet(data, i); const char *tmp; - qemuMonitorCPUDefInfoPtr cpu; - - if (VIR_ALLOC(cpu) < 0) - return -1; - - defs->cpus[i] =3D cpu; + qemuMonitorCPUDefInfoPtr cpu =3D defs->cpus + i; =20 if (!(tmp =3D virJSONValueObjectGetString(child, "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index c84ff0d6b4..81680d97f8 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -463,16 +463,16 @@ testQemuMonitorJSONGetCPUDefinitions(const void *opaq= ue) =20 #define CHECK_FULL(i, wantname, Usable) \ do { \ - if (STRNEQ(defs->cpus[i]->name, (wantname))) { \ + if (STRNEQ(defs->cpus[i].name, (wantname))) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "name %s is not %s", \ - defs->cpus[i]->name, (wantname)); \ + defs->cpus[i].name, (wantname)); \ return -1; \ } \ - if (defs->cpus[i]->usable !=3D (Usable)) { \ + if (defs->cpus[i].usable !=3D (Usable)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "%s: expecting usable flag %d, got %d", \ - defs->cpus[i]->name, Usable, defs->cpus[i]->usa= ble); \ + defs->cpus[i].name, Usable, defs->cpus[i].usabl= e); \ return -1; \ } \ } while (0) --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list