From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704327879200928.0853148268789; Wed, 3 Jan 2024 16:24:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 24A1717A0; Wed, 3 Jan 2024 19:24:38 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0EFB717C4; Wed, 3 Jan 2024 19:17:41 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D51F9176D; Wed, 3 Jan 2024 19:17:12 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id B6D79174F for ; Wed, 3 Jan 2024 19:17:08 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id 266323E1C0F; Thu, 4 Jan 2024 03:17:07 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 1/7] cpu: : virCPUx86DataAddItem() to void Date: Thu, 4 Jan 2024 03:16:57 +0300 Message-ID: <20240104001703.8067-2-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: II2WRO2L4DCKT4G6HWEBV7PWHUENKHZ3 X-Message-ID-Hash: II2WRO2L4DCKT4G6HWEBV7PWHUENKHZ3 X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704327880238100001 virCPUx86DataAddItem() return value is invariant, so change it type and remove all dependent checks. Functions changed to void: virCPUx86DataAddItem() x86DataAdd() virCPUx86DataAdd() x86DataAddSignature() virCPUx86DataSetSignature() libxlCapsAddCPUID() cpuidSetLeaf4() cpuidSetLeaf7() cpuidSetLeafB() cpuidSetLeafD() cpuidSetLeafResID() cpuidSetLeaf12() cpuidSetLeaf14() cpuidSetLeaf17() In virCPUx86GetHost() still exists this statement ``` if (cpuidSet(CPUX86_BASIC, cpuData) < 0 || cpuidSet(CPUX86_EXTENDED, cpuData) < 0) return -1; ``` Probably should change it as well. Fixes: 592517636f ("util: alloc: Reimplement VIR_APPEND_ELEMENT_COPY using = virAppendElement") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/cpu/cpu_x86.c | 179 +++++++++++++-------------------- src/cpu/cpu_x86.h | 4 +- src/libxl/libxl_capabilities.c | 13 +-- src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_monitor_json.c | 7 +- 5 files changed, 77 insertions(+), 129 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d0e3947ce..6b2531b360 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,12 +547,10 @@ virCPUx86DataAddItem(virCPUx86Data *data, sizeof(virCPUx86DataItem), virCPUx86DataSorter, NULL); } - - return 0; } =20 =20 -static int +static void x86DataAdd(virCPUx86Data *data1, const virCPUx86Data *data2) { @@ -560,12 +558,8 @@ x86DataAdd(virCPUx86Data *data1, virCPUx86DataItem *item; =20 virCPUx86DataIteratorInit(&iter, data2); - while ((item =3D virCPUx86DataNext(&iter))) { - if (virCPUx86DataAddItem(data1, item) < 0) - return -1; - } - - return 0; + while ((item =3D virCPUx86DataNext(&iter))) + virCPUx86DataAddItem(data1, item); } =20 =20 @@ -814,13 +808,13 @@ x86DataToSignature(const virCPUx86Data *data) } =20 =20 -static int +static void x86DataAddSignature(virCPUx86Data *data, uint32_t signature) { virCPUx86DataItem leaf1 =3D CPUID(.eax_in =3D 0x1, .eax =3D signature); =20 - return virCPUx86DataAddItem(data, &leaf1); + virCPUx86DataAddItem(data, &leaf1); } =20 =20 @@ -885,8 +879,7 @@ x86DataToCPU(const virCPUx86Data *data, for (blocker =3D hvModel->blockers; *blocker; blocker++) { if ((feature =3D x86FeatureFind(map, *blocker)) && !x86DataIsSubset(©, &feature->data)) - if (x86DataAdd(&modelData, &feature->data) < 0) - return NULL; + x86DataAdd(&modelData, &feature->data); } } =20 @@ -1125,8 +1118,7 @@ x86ParseDataItemList(virCPUx86Data *cpudata, } } =20 - if (virCPUx86DataAddItem(cpudata, &item) < 0) - return -1; + virCPUx86DataAddItem(cpudata, &item); ++i; =20 node =3D xmlNextElementSibling(node); @@ -1381,8 +1373,7 @@ x86ModelFromCPU(const virCPUDef *cpu, switch (fpol) { case VIR_CPU_FEATURE_FORCE: case VIR_CPU_FEATURE_REQUIRE: - if (x86DataAdd(&model->data, &feature->data) < 0) - return NULL; + x86DataAdd(&model->data, &feature->data); break; =20 case VIR_CPU_FEATURE_DISABLE: @@ -1394,8 +1385,8 @@ x86ModelFromCPU(const virCPUDef *cpu, case VIR_CPU_FEATURE_LAST: break; } - } else if (x86DataAdd(&model->data, &feature->data) < 0) { - return NULL; + } else { + x86DataAdd(&model->data, &feature->data); } } =20 @@ -1641,8 +1632,7 @@ x86ModelParseFeatures(virCPUx86Model *model, continue; } =20 - if (x86DataAdd(&model->data, &feature->data)) - return -1; + x86DataAdd(&model->data, &feature->data); } =20 model->removedFeatures =3D g_renew(char *, model->removedFeatures, nre= moved + 1); @@ -2384,8 +2374,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) @@ -2452,23 +2442,20 @@ cpuidCall(virCPUx86CPUID *cpuid) * * Sub leaf n+1 is invalid if eax[4:0] in sub leaf n equals 0. */ -static int +static void cpuidSetLeaf4(virCPUData *data, virCPUx86DataItem *subLeaf0) { 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; } =20 =20 @@ -2476,7 +2463,7 @@ cpuidSetLeaf4(virCPUData *data, * * Sub leaf n is invalid if n > eax in sub leaf 0. */ -static int +static void cpuidSetLeaf7(virCPUData *data, virCPUx86DataItem *subLeaf0) { @@ -2484,16 +2471,13 @@ 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; } =20 =20 @@ -2504,7 +2488,7 @@ cpuidSetLeaf7(virCPUData *data, * Some output values do not depend on ecx, thus sub leaf 0 provides * meaningful data even if it was (theoretically) considered invalid. */ -static int +static void cpuidSetLeafB(virCPUData *data, virCPUx86DataItem *subLeaf0) { @@ -2512,12 +2496,10 @@ 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); } - return 0; } =20 =20 @@ -2529,7 +2511,7 @@ cpuidSetLeafB(virCPUData *data, * Sub leaf n (32 <=3D n < 64) is invalid if edx[n-32] from sub leaf 0 is = not set * and edx[n-32] from sub leaf 1 is not set. */ -static int +static void cpuidSetLeafD(virCPUData *data, virCPUx86DataItem *subLeaf0) { @@ -2539,13 +2521,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; @@ -2561,10 +2541,8 @@ cpuidSetLeafD(virCPUData *data, =20 cpuid->ecx_in =3D sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } - return 0; } =20 =20 @@ -2577,7 +2555,7 @@ cpuidSetLeafD(virCPUData *data, * 0x0f: Sub leaf n is valid if edx[n] (=3D res[ResID]) from sub leaf 0 is= set. * 0x10: Sub leaf n is valid if ebx[n] (=3D res[ResID]) from sub leaf 0 is= set. */ -static int +static void cpuidSetLeafResID(virCPUData *data, virCPUx86DataItem *subLeaf0, uint32_t res) @@ -2586,18 +2564,15 @@ 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; } =20 =20 @@ -2606,7 +2581,7 @@ cpuidSetLeafResID(virCPUData *data, * Sub leaves 0 and 1 is supported if ebx[2] from leaf 0x7 (SGX) is set. * Sub leaves n >=3D 2 are valid as long as eax[3:0] !=3D 0. */ -static int +static void cpuidSetLeaf12(virCPUData *data, virCPUx86DataItem *subLeaf0) { @@ -2616,26 +2591,22 @@ cpuidSetLeaf12(virCPUData *data, =20 if (!(leaf7 =3D virCPUx86DataGet(&data->data.x86, &item)) || !(leaf7->data.cpuid.ebx & (1 << 2))) - return 0; + return; =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); } - return 0; } =20 =20 @@ -2643,7 +2614,7 @@ cpuidSetLeaf12(virCPUData *data, * * Sub leaf 0 reports the maximum supported sub leaf in eax. */ -static int +static void cpuidSetLeaf14(virCPUData *data, virCPUx86DataItem *subLeaf0) { @@ -2651,16 +2622,13 @@ 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; } =20 =20 @@ -2669,7 +2637,7 @@ cpuidSetLeaf14(virCPUData *data, * Sub leaf 0 is valid if eax >=3D 3. * Sub leaf 0 reports the maximum supported sub leaf in eax. */ -static int +static void cpuidSetLeaf17(virCPUData *data, virCPUx86DataItem *subLeaf0) { @@ -2678,25 +2646,21 @@ cpuidSetLeaf17(virCPUData *data, uint32_t sub; =20 if (subLeaf0->data.cpuid.eax < 3) - return 0; + return; =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; } =20 =20 static int cpuidSet(uint32_t base, virCPUData *data) { - int rc; uint32_t max; uint32_t leaf; virCPUx86DataItem item =3D CPUID(.eax_in =3D base); @@ -2714,28 +2678,25 @@ cpuidSet(uint32_t base, virCPUData *data) * which provide additional sub leaves for ecx_in > 0 */ if (leaf =3D=3D 0x4) - rc =3D cpuidSetLeaf4(data, &item); + cpuidSetLeaf4(data, &item); else if (leaf =3D=3D 0x7) - rc =3D cpuidSetLeaf7(data, &item); + cpuidSetLeaf7(data, &item); else if (leaf =3D=3D 0xb) - rc =3D cpuidSetLeafB(data, &item); + cpuidSetLeafB(data, &item); else if (leaf =3D=3D 0xd) - rc =3D cpuidSetLeafD(data, &item); + cpuidSetLeafD(data, &item); else if (leaf =3D=3D 0xf) - rc =3D cpuidSetLeafResID(data, &item, cpuid->edx); + cpuidSetLeafResID(data, &item, cpuid->edx); else if (leaf =3D=3D 0x10) - rc =3D cpuidSetLeafResID(data, &item, cpuid->ebx); + cpuidSetLeafResID(data, &item, cpuid->ebx); else if (leaf =3D=3D 0x12) - rc =3D cpuidSetLeaf12(data, &item); + cpuidSetLeaf12(data, &item); else if (leaf =3D=3D 0x14) - rc =3D cpuidSetLeaf14(data, &item); + cpuidSetLeaf14(data, &item); else if (leaf =3D=3D 0x17) - rc =3D cpuidSetLeaf17(data, &item); + cpuidSetLeaf17(data, &item); else - rc =3D virCPUx86DataAdd(data, &item); - - if (rc < 0) - return -1; + virCPUx86DataAdd(data, &item); } =20 return 0; @@ -2777,8 +2738,7 @@ virCPUx86GetHost(virCPUDef *cpu, }, }; =20 - if (virCPUx86DataAdd(cpuData, &item) < 0) - return -1; + virCPUx86DataAdd(cpuData, &item); } } =20 @@ -2897,9 +2857,8 @@ virCPUx86Baseline(virCPUDef **cpus, return NULL; =20 for (i =3D 0; features[i]; i++) { - if ((feat =3D x86FeatureFind(map, features[i])) && - x86DataAdd(&featData->data.x86, &feat->data) < 0) - return NULL; + if ((feat =3D x86FeatureFind(map, features[i]))) + x86DataAdd(&featData->data.x86, &feat->data); } =20 x86DataIntersect(&base_model->data, &featData->data.x86); @@ -2911,9 +2870,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,15 +3130,13 @@ 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]; - if (x86DataAddSignature(&model->data, - virCPUx86SignatureToCPUID(sig)) < 0) - return -1; + x86DataAddSignature(&model->data, + virCPUx86SignatureToCPUID(sig)); } =20 if (x86Decode(translated, &model->data, models, NULL, false) < 0) @@ -3298,15 +3254,15 @@ virCPUx86ValidateFeatures(virCPUDef *cpu) } =20 =20 -int +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { - return virCPUx86DataAddItem(&cpuData->data.x86, item); + virCPUx86DataAddItem(&cpuData->data.x86, item); } =20 =20 -int +void virCPUx86DataSetSignature(virCPUData *cpuData, unsigned int family, unsigned int model, @@ -3314,7 +3270,7 @@ virCPUx86DataSetSignature(virCPUData *cpuData, { uint32_t signature =3D x86MakeSignature(family, model, stepping); =20 - return x86DataAddSignature(&cpuData->data.x86, signature); + x86DataAddSignature(&cpuData->data.x86, signature); } =20 =20 @@ -3339,7 +3295,9 @@ virCPUx86DataSetVendor(virCPUData *cpuData, if (virCPUx86VendorToData(vendor, &item) < 0) return -1; =20 - return virCPUx86DataAdd(cpuData, &item); + virCPUx86DataAdd(cpuData, &item); + + return 0; } =20 =20 @@ -3358,8 +3316,7 @@ virCPUx86DataAddFeature(virCPUData *cpuData, !(feature =3D x86FeatureFindInternal(name))) return 0; =20 - if (x86DataAdd(&cpuData->data.x86, &feature->data) < 0) - return -1; + x86DataAdd(&cpuData->data.x86, &feature->data); =20 return 0; } diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index 416d052776..96fb8b7502 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -25,10 +25,10 @@ =20 extern struct cpuArchDriver cpuDriverX86; =20 -int virCPUx86DataAdd(virCPUData *cpuData, +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *cpuid); =20 -int virCPUx86DataSetSignature(virCPUData *cpuData, +void virCPUx86DataSetSignature(virCPUData *cpuData, unsigned int family, unsigned int model, unsigned int stepping); diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e..fc502f8ccf 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 }; @@ -65,14 +65,8 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpui= d, ssize_t ncaps) for (i =3D 0; i < ncaps; i++) { item.data.cpuid =3D cpuid[i]; =20 - 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); } - - return 0; } =20 /* @@ -119,8 +113,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); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 83119e871a..eb6b345906 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3679,8 +3679,7 @@ virQEMUCapsGetCPUModelX86Data(virQEMUCaps *qemuCaps, } } =20 - if (virCPUx86DataSetSignature(data, sigFamily, sigModel, sigStepping) = < 0) - return NULL; + virCPUx86DataSetSignature(data, sigFamily, sigModel, sigStepping); =20 return g_steal_pointer(&data); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1574723624..622e977298 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6701,10 +6701,9 @@ qemuMonitorJSONParseCPUx86Features(virJSONValue *dat= a) =20 item.type =3D VIR_CPU_X86_DATA_CPUID; for (i =3D 0; i < virJSONValueArraySize(data); i++) { - if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(dat= a, i), - &item.data.cpuid) < 0 || - virCPUx86DataAdd(cpudata, &item) < 0) - return NULL; + if (!qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(da= ta, i), + &item.data.cpuid)) + virCPUx86DataAdd(cpudata, &item); } =20 return g_steal_pointer(&cpudata); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704327623054562.4886911410771; Wed, 3 Jan 2024 16:20:23 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id F28ED187D; Wed, 3 Jan 2024 19:20:21 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 95BB517ED; Wed, 3 Jan 2024 19:17:22 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 48C0993; Wed, 3 Jan 2024 19:17:10 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id CB805175F for ; Wed, 3 Jan 2024 19:17:08 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id BFC8F3E1C9F; Thu, 4 Jan 2024 03:17:07 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 2/7] rpc: virnetserver: virNetServerAddService() to void Date: Thu, 4 Jan 2024 03:16:58 +0300 Message-ID: <20240104001703.8067-3-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: CCJCWXV7DAG5X6S4MDMVYLHGQ6ORFYWB X-Message-ID-Hash: CCJCWXV7DAG5X6S4MDMVYLHGQ6ORFYWB X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704327623294100001 virNetServerAddService() return value is invariant, so change it type and remove all dependent checks. Fixes: 7d2fd6ef01 ("Do not check return value of VIR_EXPAND_N") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/lxc/lxc_controller.c | 3 +-- src/rpc/virnetserver.c | 25 +++++-------------------- src/rpc/virnetserver.h | 2 +- tests/virnetdaemontest.c | 6 ++---- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 48f5c73fce..0a92a24fb7 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -947,8 +947,7 @@ static int virLXCControllerSetupServer(virLXCController= *ctrl) if (virSecurityManagerClearSocketLabel(ctrl->securityManager, ctrl->de= f) < 0) goto error; =20 - if (virNetServerAddService(srv, svc) < 0) - goto error; + virNetServerAddService(srv, svc); g_clear_pointer(&svc, virObjectUnref); =20 if (!(ctrl->prog =3D virNetServerProgramNew(VIR_LXC_MONITOR_PROGRAM, diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 770476c1a6..a6c6443c55 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -513,10 +513,7 @@ virNetServerNewPostExecRestart(virJSONValue *object, if (!(service =3D virNetServerServiceNewPostExecRestart(child))) return NULL; =20 - if (virNetServerAddService(srv, service) < 0) { - virObjectUnref(service); - return NULL; - } + virNetServerAddService(srv, service); } =20 =20 @@ -623,7 +620,7 @@ virNetServerPreExecRestart(virNetServer *srv) } =20 =20 -int +void virNetServerAddService(virNetServer *srv, virNetServerService *svc) { @@ -633,7 +630,6 @@ virNetServerAddService(virNetServer *srv, srv->services[srv->nservices-1] =3D virObjectRef(svc); =20 virNetServerServiceSetDispatcher(svc, virNetServerDispatchNewClient, s= rv); - return 0; } =20 =20 @@ -669,10 +665,7 @@ virNetServerAddServiceActivation(virNetServer *srv, if (!svc) return -1; =20 - if (virNetServerAddService(srv, svc) < 0) { - virObjectUnref(svc); - return -1; - } + virNetServerAddService(srv, svc); } =20 /* Intentionally return 1 any time activation is present, @@ -723,11 +716,7 @@ virNetServerAddServiceTCP(virNetServer *srv, nrequests_client_max))) return -1; =20 - if (virNetServerAddService(srv, svc) < 0) { - virObjectUnref(svc); - return -1; - } - + virNetServerAddService(srv, svc); virObjectUnref(svc); =20 return 0; @@ -772,11 +761,7 @@ virNetServerAddServiceUNIX(virNetServer *srv, nrequests_client_max))) return -1; =20 - if (virNetServerAddService(srv, svc) < 0) { - virObjectUnref(svc); - return -1; - } - + virNetServerAddService(srv, svc); virObjectUnref(svc); =20 return 0; diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 9f0cf3a3fc..dc60e2c2b2 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -59,7 +59,7 @@ void virNetServerShutdownWait(virNetServer *srv); =20 virJSONValue *virNetServerPreExecRestart(virNetServer *srv); =20 -int virNetServerAddService(virNetServer *srv, +void virNetServerAddService(virNetServer *srv, virNetServerService *svc); int virNetServerAddServiceTCP(virNetServer *srv, virSystemdActivation *act, diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 110ec748f8..74c20479d4 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -127,10 +127,8 @@ testCreateServer(const char *server_name, const char *= host, int family) 5))) goto error; =20 - if (virNetServerAddService(srv, svc1) < 0) - goto error; - if (virNetServerAddService(srv, svc2) < 0) - goto error; + virNetServerAddService(srv, svc1); + virNetServerAddService(srv, svc2); =20 if (virNetSocketNewConnectSockFD(fdclient[0], &sk1) < 0) goto error; --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704327701813135.2854226746739; Wed, 3 Jan 2024 16:21:41 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id BCA1E1754; Wed, 3 Jan 2024 19:21:40 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1183B17CD; Wed, 3 Jan 2024 19:17:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BEF741773; Wed, 3 Jan 2024 19:17:12 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id 5F7EA176C for ; Wed, 3 Jan 2024 19:17:09 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id 5B4923E1E1B; Thu, 4 Jan 2024 03:17:08 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 3/7] lxc: virLXCControllerAddConsole() to void Date: Thu, 4 Jan 2024 03:16:59 +0300 Message-ID: <20240104001703.8067-4-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: B3C4EHOYZFUYOPL3F55UH3O4XKWTATJX X-Message-ID-Hash: B3C4EHOYZFUYOPL3F55UH3O4XKWTATJX X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704327703547100001 virLXCControllerAddConsole() return value is invariant, so change it type and remove all dependent checks. Fixes: 7d2fd6ef01 ("Do not check return value of VIR_EXPAND_N") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/lxc/lxc_controller.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0a92a24fb7..f809aea6d0 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -313,7 +313,7 @@ static void virLXCControllerFree(virLXCController *ctrl) } =20 =20 -static int virLXCControllerAddConsole(virLXCController *ctrl, +static void virLXCControllerAddConsole(virLXCController *ctrl, int hostFd) { VIR_EXPAND_N(ctrl->consoles, ctrl->nconsoles, 1); @@ -326,7 +326,6 @@ static int virLXCControllerAddConsole(virLXCController = *ctrl, =20 ctrl->consoles[ctrl->nconsoles-1].epollFd =3D -1; ctrl->consoles[ctrl->nconsoles-1].epollWatch =3D -1; - return 0; } =20 =20 @@ -2655,8 +2654,7 @@ int main(int argc, char *argv[]) } =20 for (i =3D 0; i < nttyFDs; i++) { - if (virLXCControllerAddConsole(ctrl, ttyFDs[i]) < 0) - goto cleanup; + virLXCControllerAddConsole(ctrl, ttyFDs[i]); ttyFDs[i] =3D -1; } =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704327975710473.74972258019966; Wed, 3 Jan 2024 16:26:15 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A06331898; Wed, 3 Jan 2024 19:26:14 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 26CD2186F; Wed, 3 Jan 2024 19:17:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B68DF176B; Wed, 3 Jan 2024 19:17:14 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id 050E51768 for ; Wed, 3 Jan 2024 19:17:09 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id E6E6E3E1E51; Thu, 4 Jan 2024 03:17:08 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 4/7] conf: virDomainNetUpdate() to void Date: Thu, 4 Jan 2024 03:17:00 +0300 Message-ID: <20240104001703.8067-5-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: ZUXFEEL75B2E4RPYJWQ7LLUU72EFQLZS X-Message-ID-Hash: ZUXFEEL75B2E4RPYJWQ7LLUU72EFQLZS X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704327976518100001 virDomainNetUpdate() return value is invariant, so change it type and remove all dependent checks. Fixes: 98f6f2081d ("util: alloc: Reimplement VIR_APPEND_ELEMENT using virAp= pendElement") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 3 +-- src/conf/domain_conf.h | 2 +- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 82672b30a0..39e9879a8a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14690,7 +14690,7 @@ virDomainNetRemoveByObj(virDomainDef *def, virDomai= nNetDef *net) } =20 =20 -int +void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef *newnet) @@ -14725,7 +14725,6 @@ virDomainNetUpdate(virDomainDef *def, } =20 def->nets[netidx] =3D newnet; - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 14901b37ba..58b2c92f4c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3891,7 +3891,7 @@ virDomainNetDef *virDomainNetFind(virDomainDef *def, = const char *device); virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifn= ame); bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net); int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); -int virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef *= newnet); +void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef = *newnet); bool virDomainNetBackendIsEqual(virDomainNetBackend *src, virDomainNetBackend *dst); int virDomainNetDHCPInterfaces(virDomainDef *def, virDomainInterfacePtr **= ifaces); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 25cbfc57c9..3e9c1395bf 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3084,8 +3084,7 @@ lxcDomainUpdateDeviceConfig(virDomainDef *vmdef, false) < 0) return -1; =20 - if (virDomainNetUpdate(vmdef, idx, net) < 0) - return -1; + virDomainNetUpdate(vmdef, idx, net); =20 virDomainNetDefFree(oldDev.data.net); dev->data.net =3D NULL; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0b7b320648..ee7774f115 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7145,8 +7145,7 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef, false) < 0) return -1; =20 - if (virDomainNetUpdate(vmdef, pos, net)) - return -1; + virDomainNetUpdate(vmdef, pos, net); =20 virDomainNetDefFree(oldDev.data.net); dev->data.net =3D NULL; --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170432816916693.18394428368015; Wed, 3 Jan 2024 16:29:29 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C852F179F; Wed, 3 Jan 2024 19:29:27 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1E95217D1; Wed, 3 Jan 2024 19:18:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B97BE175D; Wed, 3 Jan 2024 19:17:14 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id 7A389175D for ; Wed, 3 Jan 2024 19:17:10 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id 7C0FF3E1763; Thu, 4 Jan 2024 03:17:09 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 5/7] virprocess: virProcessGetNamespaces() to void Date: Thu, 4 Jan 2024 03:17:01 +0300 Message-ID: <20240104001703.8067-6-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: SYHA46ZW4IKESGUN7H3WO22YAWG7TLXV X-Message-ID-Hash: SYHA46ZW4IKESGUN7H3WO22YAWG7TLXV X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704328171505100001 virProcessGetNamespaces() return value is invariant, so change it type and remove all dependent checks. Fixes: 7d2fd6ef01 ("Do not check return value of VIR_EXPAND_N") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/libvirt-lxc.c | 5 +---- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +-- src/util/virprocess.c | 4 +--- src/util/virprocess.h | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index ecc1207ca9..99bb450702 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -140,10 +140,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain, =20 if (noldfdlist && oldfdlist) { size_t nfds; - if (virProcessGetNamespaces(getpid(), - &nfds, - oldfdlist) < 0) - goto error; + virProcessGetNamespaces(getpid(), &nfds, oldfdlist); *noldfdlist =3D nfds; } =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3e9c1395bf..c281998652 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4691,8 +4691,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, goto endjob; } =20 - if (virProcessGetNamespaces(priv->initpid, &nfds, fdlist) < 0) - goto endjob; + virProcessGetNamespaces(priv->initpid, &nfds, fdlist); =20 ret =3D nfds; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 696d526a5d..7770e7e7eb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2737,8 +2737,7 @@ qemuProcessStartPRDaemonHook(void *opaque) int ret =3D -1; =20 if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) { - if (virProcessGetNamespaces(vm->pid, &nfds, &fds) < 0) - return ret; + virProcessGetNamespaces(vm->pid, &nfds, &fds); =20 if (nfds > 0 && virProcessSetNamespaces(nfds, fds) < 0) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b6fb17db83..74233e2169 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -652,7 +652,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t *= *pids) } =20 =20 -int virProcessGetNamespaces(pid_t pid, +void virProcessGetNamespaces(pid_t pid, size_t *nfdlist, int **fdlist) { @@ -673,8 +673,6 @@ int virProcessGetNamespaces(pid_t pid, (*fdlist)[(*nfdlist)-1] =3D fd; } } - - return 0; } =20 =20 diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 6008cca4af..cc6abc6e4b 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -70,7 +70,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **p= ids); int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp); =20 -int virProcessGetNamespaces(pid_t pid, +void virProcessGetNamespaces(pid_t pid, size_t *nfdlist, int **fdlist); =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704328095255665.5854340346312; Wed, 3 Jan 2024 16:28:15 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 29E981768; Wed, 3 Jan 2024 19:28:14 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DB750180C; Wed, 3 Jan 2024 19:17:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B8B4093; Wed, 3 Jan 2024 19:17:14 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id B9BCE93 for ; Wed, 3 Jan 2024 19:17:10 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id 112FB3E1C0F; Thu, 4 Jan 2024 03:17:10 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 6/7] node_device: udevTranslatePCIIds() to void Date: Thu, 4 Jan 2024 03:17:02 +0300 Message-ID: <20240104001703.8067-7-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: VCNGJDWLAS5XTKXXPKCG4OFKDV4PVW4Z X-Message-ID-Hash: VCNGJDWLAS5XTKXXPKCG4OFKDV4PVW4Z X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704328097018100001 udevTranslatePCIIds() return value is invariant, so change it type and remove all dependent checks. Fixes: 7f1f0453fc ("node_device: use g_strdup instead of VIR_STRDUP") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/node_device/node_device_udev.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 911325600e..8d38aec070 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -332,7 +332,7 @@ udevGenerateDeviceName(struct udev_device *device, =20 static virMutex pciaccessMutex =3D VIR_MUTEX_INITIALIZER; =20 -static int +static void udevTranslatePCIIds(unsigned int vendor, unsigned int product, char **vendor_string, @@ -356,8 +356,6 @@ udevTranslatePCIIds(unsigned int vendor, =20 *vendor_string =3D g_strdup(vendor_name); *product_string =3D g_strdup(device_name); - - return 0; } =20 =20 @@ -398,12 +396,10 @@ udevProcessPCI(struct udev_device *device, if (udevGetUintSysfsAttr(device, "device", &pci_dev->product, 16) < 0) goto cleanup; =20 - if (udevTranslatePCIIds(pci_dev->vendor, - pci_dev->product, - &pci_dev->vendor_name, - &pci_dev->product_name) !=3D 0) { - goto cleanup; - } + udevTranslatePCIIds(pci_dev->vendor, + pci_dev->product, + &pci_dev->vendor_name, + &pci_dev->product_name); =20 udevGenerateDeviceName(device, def, NULL); =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 11:58:43 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=none dis=none) header.from=red-soft.ru Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704328245024516.4794964733657; Wed, 3 Jan 2024 16:30:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E7E7E177B; Wed, 3 Jan 2024 19:30:43 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 26D9F17C3; Wed, 3 Jan 2024 19:18:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D91D193; Wed, 3 Jan 2024 19:17:14 -0500 (EST) Received: from gw.red-soft.ru (red-soft.ru [188.246.186.2]) by lists.libvirt.org (Postfix) with ESMTP id 9B0CB1763 for ; Wed, 3 Jan 2024 19:17:11 -0500 (EST) Received: from gentoo.darknet (unknown [10.81.10.45]) by gw.red-soft.ru (Postfix) with ESMTPA id 96A9F3E1C9F; Thu, 4 Jan 2024 03:17:10 +0300 (MSK) 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: Artem Chernyshev To: devel@lists.libvirt.org Subject: [PATCH 7/7] node_device: udevGetStringSysfsAttr() to void Date: Thu, 4 Jan 2024 03:17:03 +0300 Message-ID: <20240104001703.8067-8-artem.chernyshev@red-soft.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> References: <20240104001703.8067-1-artem.chernyshev@red-soft.ru> MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 182461 [Jan 03 2024] X-KLMS-AntiSpam-Version: 6.1.0.3 X-KLMS-AntiSpam-Envelope-From: artem.chernyshev@red-soft.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;red-soft.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2024/01/03 22:32:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/01/03 23:19:00 #22957326 X-KLMS-AntiVirus-Status: Clean, skipped Message-ID-Hash: QUC7LCWWLS366FH5HJK7ICMEZSERB5AZ X-Message-ID-Hash: QUC7LCWWLS366FH5HJK7ICMEZSERB5AZ X-MailFrom: artem.chernyshev@red-soft.ru 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Artem Chernyshev 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: 1704328245807100001 udevGetStringSysfsAttr() return value is invariant, so change it type and remove all dependent checks. Fixes: 7f1f0453fc ("node_device: use g_strdup instead of VIR_STRDUP") Signed-off-by: Artem Chernyshev Reviewed-by: Michal Privoznik --- src/node_device/node_device_udev.c | 55 +++++++++--------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 8d38aec070..b610bc9c16 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -245,7 +245,7 @@ udevGetDeviceSysfsAttr(struct udev_device *udev_device, } =20 =20 -static int +static void udevGetStringSysfsAttr(struct udev_device *udev_device, const char *attr_name, char **value) @@ -256,8 +256,6 @@ udevGetStringSysfsAttr(struct udev_device *udev_device, =20 if (*value !=3D NULL && (STREQ(*value, ""))) VIR_FREE(*value); - - return 0; } =20 =20 @@ -536,10 +534,9 @@ udevProcessUSBDevice(struct udev_device *device, "ID_VENDOR_FROM_DATABASE", &usb_dev->vendor_name); =20 - if (!usb_dev->vendor_name && + if (!usb_dev->vendor_name) udevGetStringSysfsAttr(device, "manufacturer", - &usb_dev->vendor_name) < 0) - return -1; + &usb_dev->vendor_name); =20 if (udevGetUintProperty(device, "ID_MODEL_ID", &usb_dev->product, 16) = < 0) return -1; @@ -548,10 +545,9 @@ udevProcessUSBDevice(struct udev_device *device, "ID_MODEL_FROM_DATABASE", &usb_dev->product_name); =20 - if (!usb_dev->product_name && + if (!usb_dev->product_name) udevGetStringSysfsAttr(device, "product", - &usb_dev->product_name) < 0) - return -1; + &usb_dev->product_name); =20 udevGenerateDeviceName(device, def, NULL); =20 @@ -602,9 +598,7 @@ udevProcessNetworkInterface(struct udev_device *device, =20 udevGetStringProperty(device, "INTERFACE", &net->ifname); =20 - if (udevGetStringSysfsAttr(device, "address", - &net->address) < 0) - return -1; + udevGetStringSysfsAttr(device, "address", &net->address); =20 if (udevGetUintSysfsAttr(device, "addr_len", &net->address_len, 0) < 0) return -1; @@ -898,8 +892,7 @@ udevProcessDASD(struct udev_device *device, { virNodeDevCapStorage *storage =3D &def->caps->data.storage; =20 - if (udevGetStringSysfsAttr(device, "device/uid", &storage->serial) < 0) - return -1; + udevGetStringSysfsAttr(device, "device/uid", &storage->serial); =20 return udevProcessDisk(device, def); } @@ -972,13 +965,11 @@ udevProcessStorage(struct udev_device *device, udevGetStringProperty(device, "ID_BUS", &storage->bus); udevGetStringProperty(device, "ID_SERIAL", &storage->serial); =20 - if (udevGetStringSysfsAttr(device, "device/vendor", &storage->vendor) = < 0) - goto cleanup; + udevGetStringSysfsAttr(device, "device/vendor", &storage->vendor); if (def->caps->data.storage.vendor) virTrimSpaces(def->caps->data.storage.vendor, NULL); =20 - if (udevGetStringSysfsAttr(device, "device/model", &storage->model) < = 0) - goto cleanup; + udevGetStringSysfsAttr(device, "device/model", &storage->model); if (def->caps->data.storage.model) virTrimSpaces(def->caps->data.storage.model, NULL); /* There is no equivalent of the hotpluggable property in libudev, @@ -1951,31 +1942,17 @@ udevGetDMIData(virNodeDevCapSystem *syscap) } } =20 - if (udevGetStringSysfsAttr(device, "product_name", - &syscap->product_name) < 0) - goto cleanup; - if (udevGetStringSysfsAttr(device, "sys_vendor", - &hardware->vendor_name) < 0) - goto cleanup; - if (udevGetStringSysfsAttr(device, "product_version", - &hardware->version) < 0) - goto cleanup; - if (udevGetStringSysfsAttr(device, "product_serial", - &hardware->serial) < 0) - goto cleanup; + udevGetStringSysfsAttr(device, "product_name", &syscap->product_name); + udevGetStringSysfsAttr(device, "sys_vendor", &hardware->vendor_name); + udevGetStringSysfsAttr(device, "product_version", &hardware->version); + udevGetStringSysfsAttr(device, "product_serial", &hardware->serial); =20 if (virGetHostUUID(hardware->uuid)) goto cleanup; =20 - if (udevGetStringSysfsAttr(device, "bios_vendor", - &firmware->vendor_name) < 0) - goto cleanup; - if (udevGetStringSysfsAttr(device, "bios_version", - &firmware->version) < 0) - goto cleanup; - if (udevGetStringSysfsAttr(device, "bios_date", - &firmware->release_date) < 0) - goto cleanup; + udevGetStringSysfsAttr(device, "bios_vendor", &firmware->vendor_name); + udevGetStringSysfsAttr(device, "bios_version", &firmware->version); + udevGetStringSysfsAttr(device, "bios_date", &firmware->release_date); =20 cleanup: if (device !=3D NULL) --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org