From nobody Sun May 19 01:43:07 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 17024654881031011.4992678113779; Wed, 13 Dec 2023 03:04:48 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9EBC217AE; Wed, 13 Dec 2023 06:04:46 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0832C1783; Wed, 13 Dec 2023 06:03:34 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 793EF1783; Wed, 13 Dec 2023 06:03:31 -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 57E2C1786 for ; Wed, 13 Dec 2023 06:03:29 -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 X-Greylist: delayed 393 seconds by postgrey-1.37 at lists.libvirt.org; Wed, 13 Dec 2023 06:03:29 EST From: Dmitry Frolov To: devel@lists.libvirt.org Subject: [PATCH] Unreacheble code cleanup Date: Wed, 13 Dec 2023 13:56:50 +0300 Message-Id: <20231213105650.1113393-1-frolov@swemel.ru> MIME-Version: 1.0 Message-ID-Hash: 4BIYDV6C44PCYRHOQBFOGW5CIQ565L3F X-Message-ID-Hash: 4BIYDV6C44PCYRHOQBFOGW5CIQ565L3F 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: 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: 1702465490856100001 Removed code is unreacheble, since the following functions always return 0: virCPUx86DataAdd() libxlCapsAddCPUID() virCapabilitiesAddHostFeature() libxl_get_physinfo() virCapabilitiesSetNetPrefix() libxlMakeDomainOSCaps() libxlMakeDomainDeviceDiskCaps() libxlMakeDomainDeviceGraphicsCaps() libxlMakeDomainDeviceVideoCaps() Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/libxl/libxl_capabilities.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e..68908874fb 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) < 0); } =20 return 0; @@ -119,8 +114,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); } @@ -145,9 +139,10 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_in= fo) cpu =3D virCPUDefNew(); =20 host_pae =3D phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) + if (host_pae) { + virCapabilitiesAddHostFeature(caps, "pae"); return -1; + } =20 host_lm =3D (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) @@ -179,17 +174,12 @@ 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; =20 - if (virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN) < 0) - goto cleanup; + virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN); =20 ret =3D 0; =20 @@ -685,11 +675,11 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, else domCaps->maxvcpus =3D PV_MAX_VCPUS; =20 - if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares)= < 0 || - libxlMakeDomainDeviceDiskCaps(disk) < 0 || - libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || - libxlMakeDomainDeviceVideoCaps(video) < 0) - return -1; + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + libxlMakeDomainDeviceDiskCaps(disk); + libxlMakeDomainDeviceGraphicsCaps(graphics); + 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