From nobody Fri May 17 07:07:52 2024 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 1702565732602978.2695772842026; Thu, 14 Dec 2023 06:55:32 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 820C419E7; Thu, 14 Dec 2023 09:55:31 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2B16919B4; Thu, 14 Dec 2023 09:52:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E77291781; Thu, 14 Dec 2023 09:52:03 -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 2090A17B9 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 01/14] cpu: turn virCPUx86DataAddItem() to void Date: Thu, 14 Dec 2023 17:50:53 +0300 Message-Id: <20231214145105.1808088-2-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: RP2Z3CFTMPQDGLQFRSZXIKVDU7KKUQR7 X-Message-ID-Hash: RP2Z3CFTMPQDGLQFRSZXIKVDU7KKUQR7 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: 1702565734473100001 virCPUx86DataAddItem() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/cpu/cpu_x86.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d0e3947ce..f32770b8a3 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -531,7 +531,7 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *sr= c) } =20 =20 -static int +static void virCPUx86DataAddItem(virCPUx86Data *data, const virCPUx86DataItem *item) { @@ -547,8 +547,6 @@ virCPUx86DataAddItem(virCPUx86Data *data, sizeof(virCPUx86DataItem), virCPUx86DataSorter, NULL); } - - return 0; } =20 =20 @@ -561,10 +559,8 @@ x86DataAdd(virCPUx86Data *data1, =20 virCPUx86DataIteratorInit(&iter, data2); while ((item =3D virCPUx86DataNext(&iter))) { - if (virCPUx86DataAddItem(data1, item) < 0) - return -1; + virCPUx86DataAddItem(data1, item); } - return 0; } =20 @@ -819,8 +815,9 @@ x86DataAddSignature(virCPUx86Data *data, uint32_t signature) { virCPUx86DataItem leaf1 =3D CPUID(.eax_in =3D 0x1, .eax =3D signature); + virCPUx86DataAddItem(data, &leaf1); =20 - return virCPUx86DataAddItem(data, &leaf1); + return 0; } =20 =20 @@ -1125,8 +1122,7 @@ x86ParseDataItemList(virCPUx86Data *cpudata, } } =20 - if (virCPUx86DataAddItem(cpudata, &item) < 0) - return -1; + virCPUx86DataAddItem(cpudata, &item); ++i; =20 node =3D xmlNextElementSibling(node); @@ -2911,9 +2907,8 @@ virCPUx86Baseline(virCPUDef **cpus, return NULL; } =20 - if (vendor && - virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0) - return NULL; + if (vendor) + virCPUx86DataAddItem(&base_model->data, &vendor->data); =20 if (x86Decode(cpu, &base_model->data, models, (const char **) modelNames, migratable) < 0) @@ -3172,9 +3167,8 @@ virCPUx86Translate(virCPUDef *cpu, if (!(model =3D x86ModelFromCPU(cpu, map, -1))) return -1; =20 - if (model->vendor && - virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0) - return -1; + if (model->vendor) + virCPUx86DataAddItem(&model->data, &model->vendor->data); =20 if (model->signatures && model->signatures->count > 0) { virCPUx86Signature *sig =3D &model->signatures->items[0]; @@ -3302,7 +3296,8 @@ int virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { - return virCPUx86DataAddItem(&cpuData->data.x86, item); + virCPUx86DataAddItem(&cpuData->data.x86, item); + return 0; } =20 =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 Reviewed-by: Jonathon Jongsma --- 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 From nobody Fri May 17 07:07:52 2024 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=none) 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 1702565809542408.517715457137; Thu, 14 Dec 2023 06:56:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 61FB719B4; Thu, 14 Dec 2023 09:56:48 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B79EF19D1; Thu, 14 Dec 2023 09:52:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A4EDE185C; Thu, 14 Dec 2023 09:52:06 -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 22768175C 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 03/14] libxl: turn libxlCapsAddCPUID() to void Date: Thu, 14 Dec 2023 17:50:55 +0300 Message-Id: <20231214145105.1808088-4-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: CRPIB5ZOMNMUKQM7PEZUQU3UYA6DLCSG X-Message-ID-Hash: CRPIB5ZOMNMUKQM7PEZUQU3UYA6DLCSG 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: 1702565810783100001 libxlCapsAddCPUID() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/libxl_capabilities.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9da0fe851c..9be64a53a8 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -55,7 +55,7 @@ struct guest_arch { =20 #define XEN_CAP_REGEX "(xen|hvm)-[[:digit:]]+\\.[[:digit:]]+-(aarch64|armv= 7l|x86_32|x86_64|ia64|powerpc64)(p|be)?" =20 -static int +static void libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) { virCPUx86DataItem item =3D { 0 }; @@ -66,8 +66,6 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid= , ssize_t ncaps) item.data.cpuid =3D cpuid[i]; virCPUx86DataAdd(data, &item); } - - return 0; } =20 /* @@ -114,8 +112,7 @@ libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap) return NULL; =20 ncaps =3D G_N_ELEMENTS(cpuid); - if (libxlCapsAddCPUID(cpudata, cpuid, ncaps) < 0) - return NULL; + libxlCapsAddCPUID(cpudata, cpuid, ncaps); =20 return g_steal_pointer(&cpudata); } --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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=none) 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 1702566118114644.6848363380378; Thu, 14 Dec 2023 07:01:58 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0579A1A67; Thu, 14 Dec 2023 10:01:57 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D5DC319C1; Thu, 14 Dec 2023 09:53:17 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CCB1B17D5; Thu, 14 Dec 2023 09:52:07 -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 2453F17C1 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 04/14] libxl: turn virCapabilitiesAddHostFeature() to void Date: Thu, 14 Dec 2023 17:50:56 +0300 Message-Id: <20231214145105.1808088-5-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: RYFFJOK6PQW7XNFYPARPY4DKZJZYEJ6Q X-Message-ID-Hash: RYFFJOK6PQW7XNFYPARPY4DKZJZYEJ6Q 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: 1702566119387100001 virCapabilitiesAddHostFeature() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 5 ++--- src/test/test_driver.c | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3..096ccc18e7 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -276,7 +276,7 @@ virCapsDispose(void *object) * * Registers a new host CPU feature, eg 'pae', or 'vmx' */ -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name) { @@ -284,8 +284,6 @@ virCapabilitiesAddHostFeature(virCaps *caps, caps->host.nfeatures, 1); caps->host.features[caps->host.nfeatures] =3D g_strdup(name); caps->host.nfeatures++; - - return 0; } =20 /** diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..085c0af868 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -236,7 +236,7 @@ virCapabilitiesHostNUMARef(virCapsHostNUMA *caps); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCapsHostNUMA, virCapabilitiesHostNUMAUnre= f); =20 -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name); =20 diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9be64a53a8..836f46341a 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -137,9 +137,8 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_inf= o) cpu =3D virCPUDefNew(); =20 host_pae =3D phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) - return -1; + if (host_pae) + virCapabilitiesAddHostFeature(caps, "pae"); =20 host_lm =3D (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 67f8e75296..ec1a9b75de 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -299,10 +299,8 @@ testBuildCapabilities(virConnectPtr conn) if ((caps =3D virCapabilitiesNew(VIR_ARCH_I686, false, false)) =3D=3D = NULL) return NULL; =20 - if (virCapabilitiesAddHostFeature(caps, "pae") < 0) - return NULL; - if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) - return NULL; + virCapabilitiesAddHostFeature(caps, "pae"); + virCapabilitiesAddHostFeature(caps, "nonpae"); =20 virCapabilitiesHostInitIOMMU(caps); =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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=none) 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 1702566638930825.4977835440394; Thu, 14 Dec 2023 07:10:38 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D23401A6B; Thu, 14 Dec 2023 10:10:37 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BDAA41A0B; Thu, 14 Dec 2023 09:54:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2407117B9; Thu, 14 Dec 2023 09:52:11 -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 3430217F1 for ; Thu, 14 Dec 2023 09:52:03 -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 05/14] libxl: turn libxl_get_physinfo() to void Date: Thu, 14 Dec 2023 17:50:57 +0300 Message-Id: <20231214145105.1808088-6-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: LICQHX4CPAGGYJLWPNQWUGCFPALY5U42 X-Message-ID-Hash: LICQHX4CPAGGYJLWPNQWUGCFPALY5U42 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: 1702566639622100001 libxl_get_physinfo() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/libxl_capabilities.c | 6 +----- src/libxl/libxl_conf.c | 20 +++++--------------- src/libxl/libxl_driver.c | 6 +----- tests/libxlmock.c | 5 +---- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 836f46341a..e141873775 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -170,11 +170,7 @@ libxlCapsInitHost(libxl_ctx *ctx, virCaps *caps) int ret =3D -1; =20 libxl_physinfo_init(&phy_info); - if (libxl_get_physinfo(ctx, &phy_info) !=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to get node physical info from libxenligh= t")); - goto cleanup; - } + libxl_get_physinfo(ctx, &phy_info); =20 if (libxlCapsInitCPU(caps, &phy_info) < 0) goto cleanup; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 62e1be6672..82f4dd80a2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -856,12 +856,8 @@ libxlMakeVnumaList(virDomainDef *def, return 0; =20 libxl_physinfo_init(&physinfo); - if (libxl_get_physinfo(ctx, &physinfo) < 0) { - libxl_physinfo_dispose(&physinfo); - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libxl_get_physinfo_info failed")); - return -1; - } + libxl_get_physinfo(ctx, &physinfo); + nr_nodes =3D physinfo.nr_nodes; libxl_physinfo_dispose(&physinfo); =20 @@ -1927,10 +1923,8 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfig *cfg, physmem: /* No 'max' specified in dom0_mem, so dom0 can use all physical memory= */ libxl_physinfo_init(&physinfo); - if (libxl_get_physinfo(cfg->ctx, &physinfo)) { - VIR_WARN("libxl_get_physinfo failed"); - return -1; - } + libxl_get_physinfo(cfg->ctx, &physinfo); + *maxmem =3D (physinfo.total_pages * cfg->verInfo->pagesize) / 1024; libxl_physinfo_dispose(&physinfo); return 0; @@ -2405,11 +2399,7 @@ libxlDriverNodeGetInfo(libxlDriverPrivate *driver, v= irNodeInfoPtr info) int ret =3D -1; =20 libxl_physinfo_init(&phy_info); - if (libxl_get_physinfo(cfg->ctx, &phy_info)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libxl_get_physinfo_info failed")); - goto cleanup; - } + libxl_get_physinfo(cfg->ctx, &phy_info); =20 if (virStrcpyStatic(info->model, virArchToString(hostarch)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c98d2d737a..d218cc63dc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4489,11 +4489,7 @@ libxlNodeGetFreeMemory(virConnectPtr conn) if (virNodeGetFreeMemoryEnsureACL(conn) < 0) goto cleanup; =20 - if (libxl_get_physinfo(cfg->ctx, &phy_info)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libxl_get_physinfo_info failed")); - goto cleanup; - } + libxl_get_physinfo(cfg->ctx, &phy_info); =20 ret =3D phy_info.free_pages * cfg->verInfo->pagesize; =20 diff --git a/tests/libxlmock.c b/tests/libxlmock.c index f564a0ef72..87796e780d 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -68,8 +68,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info, return &info; } =20 -VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo, - int, +VIR_MOCK_IMPL_VOID_ARGS(libxl_get_physinfo, libxl_ctx *, ctx, libxl_physinfo *, physinfo) { @@ -79,8 +78,6 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo, /* silence gcc warning about unused function */ if (0) real_libxl_get_physinfo(ctx, physinfo); - - return 0; } =20 VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory, --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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=none) 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 1702566554702737.4236202585769; Thu, 14 Dec 2023 07:09:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A94081A96; Thu, 14 Dec 2023 10:09:13 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5EB1219D9; Thu, 14 Dec 2023 09:54:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 019A31781; Thu, 14 Dec 2023 09:52:10 -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 667F817DE for ; Thu, 14 Dec 2023 09:52:03 -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 06/14] conf: turn virCapabilitiesSetNetPrefix() to void Date: Thu, 14 Dec 2023 17:50:58 +0300 Message-Id: <20231214145105.1808088-7-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: RMNSHNHAUNOE7LAJD3HE44QZLTUN2BY7 X-Message-ID-Hash: RMNSHNHAUNOE7LAJD3HE44QZLTUN2BY7 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: 1702566555277100001 virCapabilitiesSetNetPrefix() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 096ccc18e7..f7e7610ce6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -312,13 +312,11 @@ virCapabilitiesAddHostMigrateTransport(virCaps *caps, * * Registers the prefix that is used for generated network interfaces */ -int +void virCapabilitiesSetNetPrefix(virCaps *caps, const char *prefix) { caps->host.netprefix =3D g_strdup(prefix); - - return 0; } =20 =20 diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 085c0af868..d770cddd6b 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -244,7 +244,7 @@ int virCapabilitiesAddHostMigrateTransport(virCaps *caps, const char *name); =20 -int +void virCapabilitiesSetNetPrefix(virCaps *caps, const char *prefix); =20 diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index e141873775..1a0ce25d56 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -175,8 +175,7 @@ libxlCapsInitHost(libxl_ctx *ctx, virCaps *caps) if (libxlCapsInitCPU(caps, &phy_info) < 0) goto cleanup; =20 - if (virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN) < 0) - goto cleanup; + virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN); =20 ret =3D 0; =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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=none) 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 1702565965676175.26227602599897; Thu, 14 Dec 2023 06:59:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9A1171A60; Thu, 14 Dec 2023 09:59:24 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AC70D19EE; Thu, 14 Dec 2023 09:52:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7D52D185C; Thu, 14 Dec 2023 09:52:07 -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 AA45317D5 for ; Thu, 14 Dec 2023 09:52:02 -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 07/14] libxl: turn libxlMakeDomainOSCaps() to void Date: Thu, 14 Dec 2023 17:50:59 +0300 Message-Id: <20231214145105.1808088-8-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: ZYR3YYMASW4MMYLR25BTVMWJKP72PWE2 X-Message-ID-Hash: ZYR3YYMASW4MMYLR25BTVMWJKP72PWE2 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: 1702565967394100001 libxlMakeDomainOSCaps() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/libxl_capabilities.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 1a0ce25d56..f419dd9d20 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -504,7 +504,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) return 0; } =20 -static int +static void libxlMakeDomainOSCaps(const char *machine, virDomainCapsOS *os, virFirmware **firmwares, @@ -519,7 +519,7 @@ libxlMakeDomainOSCaps(const char *machine, capsLoader->readonly.report =3D true; =20 if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh")) - return 0; + return; =20 capsLoader->supported =3D VIR_TRISTATE_BOOL_YES; capsLoader->values.values =3D g_new0(char *, nfirmwares); @@ -535,7 +535,7 @@ libxlMakeDomainOSCaps(const char *machine, VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly, VIR_TRISTATE_BOOL_YES); =20 - return 0; + return; } =20 static int @@ -671,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, else domCaps->maxvcpus =3D PV_MAX_VCPUS; =20 - if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares)= < 0 || - libxlMakeDomainDeviceDiskCaps(disk) < 0 || + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 1702566805393974.952121085318; Thu, 14 Dec 2023 07:13:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 50BEE19DD; Thu, 14 Dec 2023 10:13:24 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 77B761A35; Thu, 14 Dec 2023 09:54:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D94B51781; Thu, 14 Dec 2023 09:52:11 -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 78009182A for ; Thu, 14 Dec 2023 09:52:03 -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 08/14] libxl: turn libxlMakeDomainDeviceDiskCaps() to void Date: Thu, 14 Dec 2023 17:51:00 +0300 Message-Id: <20231214145105.1808088-9-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: FVKK4WPQQAZEOYKHCHPQ5SRUAJH2V4HN X-Message-ID-Hash: FVKK4WPQQAZEOYKHCHPQ5SRUAJH2V4HN 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: 1702566806498100001 libxlMakeDomainDeviceDiskCaps() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/libxl_capabilities.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index f419dd9d20..31b6fbc629 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -538,7 +538,7 @@ libxlMakeDomainOSCaps(const char *machine, return; } =20 -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -555,7 +555,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *= dev) VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); =20 - return 0; } =20 static int @@ -672,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->maxvcpus =3D PV_MAX_VCPUS; =20 libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); - if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || - libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || + libxlMakeDomainDeviceDiskCaps(disk); + if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 1702566039676783.3090718367656; Thu, 14 Dec 2023 07:00:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 36CD61A74; Thu, 14 Dec 2023 10:00:38 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CFDC819C7; Thu, 14 Dec 2023 09:53:06 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 842EF17C8; Thu, 14 Dec 2023 09:52:07 -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 AE52F17D7 for ; Thu, 14 Dec 2023 09:52:02 -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 09/14] libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void Date: Thu, 14 Dec 2023 17:51:01 +0300 Message-Id: <20231214145105.1808088-10-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: BFV7WMIGADVNJDX3LPU4CR6D7TU7T35J X-Message-ID-Hash: BFV7WMIGADVNJDX3LPU4CR6D7TU7T35J 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: 1702566039953100001 libxlMakeDomainDeviceGraphicsCaps() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/libxl_capabilities.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 31b6fbc629..b1e0985b7a 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -557,7 +557,7 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *= dev) =20 } =20 -static int +static void libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -568,7 +568,6 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGr= aphics *dev) VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_SPICE); =20 - return 0; } =20 static int @@ -672,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, =20 libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); - if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || - libxlMakeDomainDeviceVideoCaps(video) < 0) + libxlMakeDomainDeviceGraphicsCaps(graphics); + if (libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 1702566392236740.6210351599809; Thu, 14 Dec 2023 07:06:32 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2BF9119D0; Thu, 14 Dec 2023 10:06:31 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 02AA71944; Thu, 14 Dec 2023 09:53:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1F3D41781; Thu, 14 Dec 2023 09:52:10 -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 D2CA417E1 for ; Thu, 14 Dec 2023 09:52:02 -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 10/14] libxl: turn libxlMakeDomainDeviceVideoCaps() to void Date: Thu, 14 Dec 2023 17:51:02 +0300 Message-Id: <20231214145105.1808088-11-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: Z4HZINCKLIZMUUAPP7YZPC2IRGW3B5P6 X-Message-ID-Hash: Z4HZINCKLIZMUUAPP7YZPC2IRGW3B5P6 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: 1702566394411100005 libxlMakeDomainDeviceVideoCaps() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index b1e0985b7a..3a2b0fe2bd 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -570,7 +570,7 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGr= aphics *dev) =20 } =20 -static int +static void libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -580,8 +580,6 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo= *dev) VIR_DOMAIN_VIDEO_TYPE_VGA, VIR_DOMAIN_VIDEO_TYPE_CIRRUS, VIR_DOMAIN_VIDEO_TYPE_XEN); - - return 0; } =20 static int @@ -672,8 +670,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); libxlMakeDomainDeviceGraphicsCaps(graphics); - if (libxlMakeDomainDeviceVideoCaps(video) < 0) - return -1; + libxlMakeDomainDeviceVideoCaps(video); + if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) return -1; --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 1702566731830959.5161774126753; Thu, 14 Dec 2023 07:12:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B9CAA17C8; Thu, 14 Dec 2023 10:12:10 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EEC551A2E; Thu, 14 Dec 2023 09:54:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 764AA1781; Thu, 14 Dec 2023 09:52:11 -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 4C0E21812 for ; Thu, 14 Dec 2023 09:52:03 -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 11/14] conf: turn virDomainGraphicsListenAppendAddress() to void Date: Thu, 14 Dec 2023 17:51:03 +0300 Message-Id: <20231214145105.1808088-12-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: UJ7KVIO3T34JTOGSGQQFLNEJV5RI5L5B X-Message-ID-Hash: UJ7KVIO3T34JTOGSGQQFLNEJV5RI5L5B 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: 1702566733974100001 virDomainGraphicsListenAppendAddress() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 7 ++----- src/libxl/xen_xl.c | 3 +-- src/vbox/vbox_common.c | 4 +--- src/vmx/vmx.c | 3 +-- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22ad43e1d7..7b4d86d837 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29053,7 +29053,7 @@ virDomainGraphicsGetListen(virDomainGraphicsDef *de= f, size_t i) } =20 =20 -int +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) { @@ -29064,8 +29064,6 @@ virDomainGraphicsListenAppendAddress(virDomainGraph= icsDef *def, glisten.address =3D g_strdup(address); =20 VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten); - - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ed07859bc5..7002bd072b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3909,7 +3909,7 @@ int virDomainHostdevMatch(virDomainHostdevDef *a, =20 virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); -int virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenAppendSocket(virDomainGraphicsDef *def, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d5a0399613..c7bc51b926 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -673,8 +673,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) =20 if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr)= < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); =20 if (xenConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.= vnc.auth.passwd) < 0) @@ -766,9 +765,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) key =3D nextkey; } if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (virDomainGraphicsListenAppendAddress(graphics, - listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); } def->graphics =3D g_new0(virDomainGraphicsDef *, 1); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..553aa77896 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -341,8 +341,7 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) graphics->type =3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE; if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr)= < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); =20 if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..9f6612ad61 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3625,8 +3625,7 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver= *data, IMachine *machine) if (netAddressUtf8 && STREQ(netAddressUtf8, "")) VBOX_UTF8_FREE(netAddressUtf8); =20 - if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8)= < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8); =20 gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMu= ltiConnection); if (allowMultiConnection) @@ -3641,7 +3640,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver= *data, IMachine *machine) =20 ret =3D 0; =20 - cleanup: VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..e746ff213b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2017,8 +2017,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **= def) goto failure; } =20 - if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0) - goto failure; + virDomainGraphicsListenAppendAddress(*def, listenAddr); VIR_FREE(listenAddr); =20 if (port < 0) { --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 170256588450782.20913010558877; Thu, 14 Dec 2023 06:58:04 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 812CA1995; Thu, 14 Dec 2023 09:58:03 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 72BF819EA; Thu, 14 Dec 2023 09:52:48 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2BAC317C9; Thu, 14 Dec 2023 09:52:07 -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 8E24917BE for ; Thu, 14 Dec 2023 09:52:02 -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 12/14] vbox: turn vboxDumpDisplay() to void Date: Thu, 14 Dec 2023 17:51:04 +0300 Message-Id: <20231214145105.1808088-13-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: XAY5SYNC3OBK5SEKVXWLC2LVHLHMWV5R X-Message-ID-Hash: XAY5SYNC3OBK5SEKVXWLC2LVHLHMWV5R 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: 1702565885045100001 vboxDumpDisplay() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/vbox/vbox_common.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9f6612ad61..305c85f4ec 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3538,7 +3538,7 @@ vboxDumpVideo(virDomainDef *def, struct _vboxDriver *= data G_GNUC_UNUSED, return 0; } =20 -static int +static void vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *mac= hine) { /* dump display options vrdp/gui/sdl */ @@ -3549,7 +3549,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver= *data, IMachine *machine) IVRDEServer *VRDEServer =3D NULL; PRBool VRDxEnabled =3D PR_FALSE; virDomainGraphicsDef *graphics =3D NULL; - int ret =3D -1; =20 def->ngraphics =3D 0; =20 @@ -3638,13 +3637,10 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriv= er *data, IMachine *machine) VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics); } =20 - ret =3D 0; - VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return ret; } =20 static int @@ -4160,8 +4156,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, u= nsigned int flags) =20 if (vboxDumpVideo(def, data, machine) < 0) goto cleanup; - if (vboxDumpDisplay(def, data, machine) < 0) - goto cleanup; + vboxDumpDisplay(def, data, machine); if (vboxDumpStorageControllers(def, machine) < 0) goto cleanup; if (vboxDumpDisks(def, data, machine) < 0) --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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 1702566456375677.6785935002301; Thu, 14 Dec 2023 07:07:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 508D21A21; Thu, 14 Dec 2023 10:07:35 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EDCBF19FB; Thu, 14 Dec 2023 09:53:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A459C17BE; Thu, 14 Dec 2023 09:52:10 -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 2FB0117E5 for ; Thu, 14 Dec 2023 09:52:03 -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 13/14] libxl: turn xenParseXLNamespaceData() to void Date: Thu, 14 Dec 2023 17:51:05 +0300 Message-Id: <20231214145105.1808088-14-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: XFF2EDWYYJ4SYR7GAQOXJA5L6H4BBIU5 X-Message-ID-Hash: XFF2EDWYYJ4SYR7GAQOXJA5L6H4BBIU5 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: 1702566456896100001 xenParseXLNamespaceData() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/libxl/xen_xl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 553aa77896..78a3e1d519 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1017,7 +1017,7 @@ xenParseXLChannel(virConf *conf, virDomainDef *def) return -1; } =20 -static int +static void xenParseXLNamespaceData(virConf *conf, virDomainDef *def) { virConfValue *list =3D virConfGetValue(conf, "device_model_args"); @@ -1104,8 +1104,7 @@ xenParseXL(virConf *conf, if (xenParseXLChannel(conf, def) < 0) return NULL; =20 - if (xenParseXLNamespaceData(conf, def) < 0) - return NULL; + xenParseXLNamespaceData(conf, def); =20 if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 07:07:52 2024 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=none) 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 1702566213938184.29957134221047; Thu, 14 Dec 2023 07:03:33 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DD2981A7D; Thu, 14 Dec 2023 10:03:32 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0A6E81984; Thu, 14 Dec 2023 09:53:27 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 98A7617CE; Thu, 14 Dec 2023 09:52:08 -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 C35A917D3 for ; Thu, 14 Dec 2023 09:52:02 -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 14/14] rpc: turn virNetClientAddProgram() to void Date: Thu, 14 Dec 2023 17:51:06 +0300 Message-Id: <20231214145105.1808088-15-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: 7JS2QRWNRNTAO4VAYZXQGB2MSWX7Z7IW X-Message-ID-Hash: 7JS2QRWNRNTAO4VAYZXQGB2MSWX7Z7IW 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: 1702566215607100001 virNetClientAddProgram() always returns 0. Signed-off-by: Dmitry Frolov Reviewed-by: Jonathon Jongsma --- src/admin/admin_remote.c | 3 +-- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_monitor.c | 4 +--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 3291a1e965..5c4913a76e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path) NULL, 0, NULL))) goto error; =20 - if (virNetClientAddProgram(priv->client, priv->program) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->program); =20 return priv; error: diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index d75302dd0a..0b6c720477 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnection= New(bool privileged, NULL))) goto error; =20 - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); =20 return client; =20 diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index d8490f4e5a..19e23d65c5 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged, NULL))) goto error; =20 - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); =20 VIR_FREE(daemonPath); VIR_FREE(logdpath); diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 811d6685e5..cf2fd1897f 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -169,9 +169,7 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, mon))) goto error; =20 - if (virNetClientAddProgram(mon->client, - mon->program) < 0) - goto error; + virNetClientAddProgram(mon->client, mon->program); =20 mon->vm =3D virObjectRef(vm); memcpy(&mon->cb, cb, sizeof(mon->cb)); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 132d0194c6..8db638d6cc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn, conn))) goto error; =20 - if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 || - virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 || - virNetClientAddProgram(priv->client, priv->qemuProgram) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->remoteProgram); + virNetClientAddProgram(priv->client, priv->lxcProgram); + virNetClientAddProgram(priv->client, priv->qemuProgram); =20 /* Try and authenticate with server */ VIR_DEBUG("Trying authentication"); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 4ab8af68c5..c5be82abee 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client) } =20 =20 -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog) { virObjectLock(client); @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client, client->programs[client->nprograms-1] =3D virObjectRef(prog); =20 virObjectUnlock(client); - return 0; } =20 =20 diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 1647a6cc71..7726b57ef4 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexe= c); =20 bool virNetClientHasPassFD(virNetClient *client); =20 -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog); =20 int virNetClientAddStream(virNetClient *client, --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org