From nobody Tue Feb 10 21:00:26 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=quarantine dis=quarantine) header.from=swemel.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1702566321912649.6066587031642; Thu, 14 Dec 2023 07:05:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3A28019CF; Thu, 14 Dec 2023 10:05:20 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E3E31198C; Thu, 14 Dec 2023 09:53:37 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 435C717C8; Thu, 14 Dec 2023 09:52:09 -0500 (EST) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2626117C3 for ; Thu, 14 Dec 2023 09:52:00 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 From: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH v2 02/14] cpu: turn virCPUx86DataAdd() to void Date: Thu, 14 Dec 2023 17:50:54 +0300 Message-Id: <20231214145105.1808088-3-frolov@swemel.ru> In-Reply-To: <20231214145105.1808088-1-frolov@swemel.ru> References: <20231214145105.1808088-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: DMSJDYVDABWMHFD3KQ6HIY3HWKEPRU5A X-Message-ID-Hash: DMSJDYVDABWMHFD3KQ6HIY3HWKEPRU5A X-MailFrom: frolov@swemel.ru X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: sdl.libvirt@linuxtesting.org, Dmitry Frolov X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1702566324108100001 virCPUx86DataAdd() always returns 0. Signed-off-by: Dmitry Frolov --- src/cpu/cpu_x86.c | 66 +++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 7 +--- 3 files changed, 26 insertions(+), 49 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f32770b8a3..4f3bfd075b 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2380,8 +2380,8 @@ x86Encode(virArch arch, if (!(data_vendor =3D virCPUDataNew(arch))) return -1; =20 - if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0) - return -1; + if (v) + virCPUx86DataAdd(data_vendor, &v->data); } =20 if (forced) @@ -2455,14 +2455,12 @@ cpuidSetLeaf4(virCPUData *data, virCPUx86DataItem item =3D *subLeaf0; virCPUx86CPUID *cpuid =3D &item.data.cpuid; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 while (cpuid->eax & 0x1f) { cpuid->ecx_in++; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2480,14 +2478,12 @@ cpuidSetLeaf7(virCPUData *data, virCPUx86CPUID *cpuid =3D &item.data.cpuid; uint32_t sub; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 for (sub =3D 1; sub <=3D subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in =3D sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2508,8 +2504,7 @@ cpuidSetLeafB(virCPUData *data, virCPUx86CPUID *cpuid =3D &item.data.cpuid; =20 while (cpuid->ecx & 0xff00) { - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in++; cpuidCall(cpuid); } @@ -2535,13 +2530,11 @@ cpuidSetLeafD(virCPUData *data, virCPUx86CPUID sub1; uint32_t sub; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 cpuid->ecx_in =3D 1; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); =20 sub0 =3D subLeaf0->data.cpuid; sub1 =3D *cpuid; @@ -2557,8 +2550,7 @@ cpuidSetLeafD(virCPUData *data, =20 cpuid->ecx_in =3D sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2582,16 +2574,14 @@ cpuidSetLeafResID(virCPUData *data, virCPUx86CPUID *cpuid =3D &item.data.cpuid; uint32_t sub; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 for (sub =3D 1; sub < 32; sub++) { if (!(res & (1U << sub))) continue; cpuid->ecx_in =3D sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2614,20 +2604,17 @@ cpuidSetLeaf12(virCPUData *data, !(leaf7->data.cpuid.ebx & (1 << 2))) return 0; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 cpuid->eax_in =3D 0x12; cpuid->ecx_in =3D 1; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); =20 cpuid->ecx_in =3D 2; cpuidCall(cpuid); while (cpuid->eax & 0xf) { - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in++; cpuidCall(cpuid); } @@ -2647,14 +2634,12 @@ cpuidSetLeaf14(virCPUData *data, virCPUx86CPUID *cpuid =3D &item.data.cpuid; uint32_t sub; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 for (sub =3D 1; sub <=3D subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in =3D sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2676,14 +2661,12 @@ cpuidSetLeaf17(virCPUData *data, if (subLeaf0->data.cpuid.eax < 3) return 0; =20 - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); =20 for (sub =3D 1; sub <=3D subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in =3D sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2728,7 +2711,7 @@ cpuidSet(uint32_t base, virCPUData *data) else if (leaf =3D=3D 0x17) rc =3D cpuidSetLeaf17(data, &item); else - rc =3D virCPUx86DataAdd(data, &item); + virCPUx86DataAdd(data, &item); =20 if (rc < 0) return -1; @@ -2773,8 +2756,7 @@ virCPUx86GetHost(virCPUDef *cpu, }, }; =20 - if (virCPUx86DataAdd(cpuData, &item) < 0) - return -1; + virCPUx86DataAdd(cpuData, &item); } } =20 @@ -3292,12 +3274,11 @@ virCPUx86ValidateFeatures(virCPUDef *cpu) } =20 =20 -int +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { virCPUx86DataAddItem(&cpuData->data.x86, item); - return 0; } =20 =20 @@ -3334,7 +3315,8 @@ virCPUx86DataSetVendor(virCPUData *cpuData, if (virCPUx86VendorToData(vendor, &item) < 0) return -1; =20 - return virCPUx86DataAdd(cpuData, &item); + virCPUx86DataAdd(cpuData, &item); + return 0; } =20 =20 diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index 416d052776..f0d73a5f40 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -25,7 +25,7 @@ =20 extern struct cpuArchDriver cpuDriverX86; =20 -int virCPUx86DataAdd(virCPUData *cpuData, +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *cpuid); =20 int virCPUx86DataSetSignature(virCPUData *cpuData, diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e..9da0fe851c 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -64,12 +64,7 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpui= d, ssize_t ncaps) item.type =3D VIR_CPU_X86_DATA_CPUID; for (i =3D 0; i < ncaps; i++) { item.data.cpuid =3D cpuid[i]; - - if (virCPUx86DataAdd(data, &item) < 0) { - VIR_DEBUG("Failed to add CPUID(%x,%x)", - cpuid[i].eax_in, cpuid[i].ecx_in); - return -1; - } + virCPUx86DataAdd(data, &item); } =20 return 0; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org