From nobody Tue Sep 9 03:17:52 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=1747232811; cv=none; d=zohomail.com; s=zohoarc; b=GpN0FzDmIxkod6LOY3NK2zwMw82Jnqb4TQH5pKeEhIbCTmeaeCI6+WePxNwfkrw8alRetfLVqS2Ou0DjlZ0V6LsNM+GadaXlSQ+hm+oTVPiLPqjazZGiVghwgA3YRqqb5g2+4pRWceB04r/BECf/tFjr2VrBAyDN+PM84ruxn4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747232811; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=CJ3v37lY7SBsgRfnpRg9fa09B27mbCqoEkqFMMSnojc=; b=bDRMnJHdi2WbjQ8leXVuPBQacCULSuHhh58ZUQsUZi/rlc5d+8eVjaqNGDLWwQkAP7ynlueG3Il0pHsEBis3zAphysjZdqes19OW1UkQi9piWPf19mCf3flbViZ1GEnSv8UZf2tzcBFw7VSiAgpzk+Jf9pSr7RMIM/SVZ7XonFA= 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 1747232811506629.6328111581909; Wed, 14 May 2025 07:26:51 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 768FD11B6; Wed, 14 May 2025 10:26:50 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 360F4DF3; Wed, 14 May 2025 10:24:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 85114CEE; Wed, 14 May 2025 10:24:44 -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 D3B47CEE for ; Wed, 14 May 2025 10:24:30 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-QvsLInz1PT6bXSeaIVwX4w-1; Wed, 14 May 2025 10:24:29 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 804BE195608A for ; Wed, 14 May 2025 14:24:28 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C901A1955F24 for ; Wed, 14 May 2025 14:24:27 +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=1747232670; 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: in-reply-to:in-reply-to:references:references; bh=9NOc8agBnqYRgtScMNpCiTA3CXW1TbGODsX2kzI7bbQ=; b=MXO3I72VCiw3IKfXDTCzV6d7YPLGteSargQ6nlcUZGPAVCm5vmBN27O4P2TzZ4h+xMewqc 1vRh1GOIxM7pekyrOYcDmqU4bVZzGZAFdEcrzHWEw4dIlhMwA3nSTc6PXGQybRM2eQO/kO BXAMwJmHSH6ST83k9e0Vw75/e0cCBT8= X-MC-Unique: QvsLInz1PT6bXSeaIVwX4w-1 X-Mimecast-MFC-AGG-ID: QvsLInz1PT6bXSeaIVwX4w_1747232668 To: devel@lists.libvirt.org Subject: [PATCH 7/7] src: Fix retval of some functions declared to return an int Date: Wed, 14 May 2025 16:24:16 +0200 Message-ID: <73a8a9a50149905ac3a9f27b2d3fe69af5b188fe.1747232412.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EGPPL2QoXfXaCD7Rw5r3VDu1C0oHX41kfSI3-8Wm8mU_1747232668 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OWNJRHB5JNHDH2JFVJQMGULPRAMKNIVZ X-Message-ID-Hash: OWNJRHB5JNHDH2JFVJQMGULPRAMKNIVZ 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: 1747232812460116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik There are couple of functions (virCHDomainPrepareHostdevPCI(), qemuDomainPrepareHostdevPCI(), virStorageBackendRBDSetAllocation(), virCommandHandshakeChild()) that are declared to return an integer, but in fact return a boolean. This may lead to incorrect behaviour. Fix their retvals. This diff was generated using the following semantic patch: @@ identifier foo; @@ int foo(...) { <+... ( - return true; + return 0; | - return false; + return -1; ) ...+> } Each function and its callers were then inspected to see what retvals are expected. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/ch/ch_hostdev.c | 8 ++++---- src/qemu/qemu_domain.c | 8 ++++---- src/storage/storage_backend_rbd.c | 2 +- src/util/vircommand.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ch/ch_hostdev.c b/src/ch/ch_hostdev.c index 641032de30..34eb025c97 100644 --- a/src/ch/ch_hostdev.c +++ b/src/ch/ch_hostdev.c @@ -69,20 +69,20 @@ virCHDomainPrepareHostdevPCI(virDomainHostdevDef *hostd= ev) if (!supportsPassthroughVFIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("host doesn't support VFIO PCI passthrough")); - return false; + return -1; } break; =20 case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("host doesn't support legacy PCI passthrough")); - return false; + return -1; =20 case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("CH does not support device assignment mode '%1$s= '"), virDeviceHostdevPCIDriverNameTypeToString(*driverNa= me)); - return false; + return -1; =20 default: case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST: @@ -90,7 +90,7 @@ virCHDomainPrepareHostdevPCI(virDomainHostdevDef *hostdev) break; } =20 - return true; + return 0; } =20 int diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 52da234343..7a34bc1c7f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9945,20 +9945,20 @@ qemuDomainPrepareHostdevPCI(virDomainHostdevDef *ho= stdev, if (!supportsPassthroughVFIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("host doesn't support VFIO PCI passthrough")); - return false; + return -1; } break; =20 case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_KVM: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("host doesn't support legacy PCI passthrough")); - return false; + return -1; =20 case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("QEMU does not support device assignment mode '%1= $s'"), virDeviceHostdevPCIDriverNameTypeToString(*driverNa= me)); - return false; + return -1; =20 default: case VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_LAST: @@ -9966,7 +9966,7 @@ qemuDomainPrepareHostdevPCI(virDomainHostdevDef *host= dev, break; } =20 - return true; + return 0; } =20 =20 diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index fd46c8be55..038a1a9e34 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -516,7 +516,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDef *vol= G_GNUC_UNUSED, rbd_image_info_t *info G_GNUC_UNUSED) { virReportUnsupportedError(); - return false; + return -1; } #endif =20 diff --git a/src/util/vircommand.c b/src/util/vircommand.c index ea52acfbb8..d9e4c0181f 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -397,7 +397,7 @@ virCommandHandshakeChild(virCommand *cmd) int rv; =20 if (!cmd->handshake) - return true; + return 0; =20 VIR_DEBUG("Notifying parent for handshake start on %d", cmd->handshakeWait[1]); --=20 2.49.0