From nobody Tue Sep 9 19:25:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1749112683; cv=none; d=zohomail.com; s=zohoarc; b=Bd9TvkfLRMIm/GwAB0Zwk4pPq2OpfQ2sgPuG+9p/GJxdlEKgQjDl1yFc/v0b0tcQ75+SgxNc16GqKksJRBOruhmACOJYXjiCSa0tZG1kXrVgS3LL4P/N60Dgi5PulpdvO8OJjAqkcIrOnt6AM8ebqbNv+BLoAFR0RSSBoU8L3Ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749112683; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=1Rft+yTk801ODeppnl+PN59dCsXMKlCWLjHyUOSIbK4=; b=gt5tAd6R7ZueQ1o9b/qfN1LOOREqiiFr1esfO42BjTp1/8fC6axauMnVgPrEOnTurMkvRj08ap1Xt5AbmfTwa0PaQd3nCxnI/HuzZnAJKUdobFkeHtL2WIBdQ7S+4h9iS4itulRzwfuWT+TfvEsidMkUaJqn+3y8YjxbiJWcDUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1749112683729471.9063275546541; Thu, 5 Jun 2025 01:38:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B2B9E1200; Thu, 5 Jun 2025 04:38:02 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 25DE211FA; Thu, 5 Jun 2025 04:37:41 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 84A0D11E1; Thu, 5 Jun 2025 04:37:37 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 A15CD11CA for ; Thu, 5 Jun 2025 04:37:36 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-331-d4FPK2urO-WqwQ8ns8w77w-1; Thu, 05 Jun 2025 04:37:35 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59B431800378 for ; Thu, 5 Jun 2025 08:37:34 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A4119195E74A for ; Thu, 5 Jun 2025 08:37:33 +0000 (UTC) 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=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749112656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JdhstcRvbkhnfZt8DmUWr5dLvDrgBmxTZT3twnRuGUE=; b=BOod0gO0HxO7Kd0mOKj0fCmJnQSifqWkQ3kqV8bCizxfr8MFAcgjUpINRh3wvUhQX90ZfE 8PmjDABaKxstZo9hxylGx52mKZMNnUp5XnHmE3lAGbyF4Rq0Z1D/FvmKw2jFhvBB5b3Rw2 64HCQCU2CWg7lsrtXMY/ZkTll9VscZU= X-MC-Unique: d4FPK2urO-WqwQ8ns8w77w-1 X-Mimecast-MFC-AGG-ID: d4FPK2urO-WqwQ8ns8w77w_1749112654 To: devel@lists.libvirt.org Subject: [PATCH] libxl_capabilities: Make some functions return void Date: Thu, 5 Jun 2025 10:37:11 +0200 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: zZcdXOkfvOqm_drPHaOCbRQ-lIyVoFdluY_AD7IVVag_1749112654 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3BN3HUIIFVPX46RFGJOHV34XUIKE7LGX X-Message-ID-Hash: 3BN3HUIIFVPX46RFGJOHV34XUIKE7LGX X-MailFrom: mprivozn@redhat.com 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 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: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749112684867116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Inside of libxlMakeDomainCapabilities() there are some functions called and basically all of them never return anything but zero (indicating success). Yet, they are called in a fashion that suggests otherwise. Turn those functions into void and drop checks for their retvals. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/libxl/libxl_capabilities.c | 43 +++++++++++++--------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 6aca4075e7..48f7619cc4 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -512,7 +512,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) return 0; } =20 -static int +static void libxlMakeDomainOSCaps(const char *machine, virDomainCapsOS *os, virFirmware **firmwares, @@ -527,7 +527,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); @@ -542,11 +542,9 @@ libxlMakeDomainOSCaps(const char *machine, VIR_DOMAIN_LOADER_TYPE_PFLASH); VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly, VIR_TRISTATE_BOOL_YES); - - return 0; } =20 -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -562,11 +560,9 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk = *dev) VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); - - return 0; } =20 -static int +static void libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -576,11 +572,9 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceG= raphics *dev) VIR_DOMAIN_GRAPHICS_TYPE_SDL, VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_SPICE); - - return 0; } =20 -static int +static void libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -590,11 +584,9 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVide= o *dev) VIR_DOMAIN_VIDEO_TYPE_VGA, VIR_DOMAIN_VIDEO_TYPE_CIRRUS, VIR_DOMAIN_VIDEO_TYPE_XEN); - - return 0; } =20 -static int +static void libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev) { dev->supported =3D VIR_TRISTATE_BOOL_YES; @@ -625,10 +617,9 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHo= stdev *dev) =20 virDomainCapsEnumClear(&dev->pciBackend); VIR_DOMAIN_CAPS_ENUM_SET(dev->pciBackend, VIR_DEVICE_HOSTDEV_PCI_DRIVE= R_NAME_XEN); - return 0; } =20 -static int +static void libxlMakeDomainDeviceConsoleCaps(virDomainCapsDeviceConsole *console) { console->supported =3D VIR_TRISTATE_BOOL_YES; @@ -643,8 +634,6 @@ libxlMakeDomainDeviceConsoleCaps(virDomainCapsDeviceCon= sole *console) VIR_DOMAIN_CHR_TYPE_UDP, VIR_DOMAIN_CHR_TYPE_UNIX, VIR_DOMAIN_CHR_TYPE_VC); - - return 0; } =20 virCaps * @@ -698,15 +687,15 @@ 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 || - libxlMakeDomainDeviceConsoleCaps(console)) - return -1; - if (STRNEQ(domCaps->machine, "xenpvh") && - libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) - return -1; + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + libxlMakeDomainDeviceDiskCaps(disk); + libxlMakeDomainDeviceGraphicsCaps(graphics); + libxlMakeDomainDeviceVideoCaps(video); + libxlMakeDomainDeviceConsoleCaps(console); + + if (STRNEQ(domCaps->machine, "xenpvh")) { + libxlMakeDomainDeviceHostdevCaps(hostdev); + } =20 domCaps->features[VIR_DOMAIN_CAPS_FEATURE_IOTHREADS] =3D VIR_TRISTATE_= BOOL_NO; domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] =3D VIR_TRISTATE= _BOOL_NO; --=20 2.49.0