From nobody Tue Dec 16 16:40:55 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1739550789468155.77520158035406; Fri, 14 Feb 2025 08:33:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BB0BB50; Fri, 14 Feb 2025 11:33:08 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 976971B7A; Fri, 14 Feb 2025 11:30:34 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CD7561BCB; Fri, 14 Feb 2025 11:30:29 -0500 (EST) 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 9B4A31AC5 for ; Fri, 14 Feb 2025 11:30:04 -0500 (EST) 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-201-ShtG-BzoOSu5ik-DoEuv3A-1; Fri, 14 Feb 2025 11:30:03 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 A472018011DC for ; Fri, 14 Feb 2025 16:30:01 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 89D1D1955DCE; Fri, 14 Feb 2025 16:30:00 +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, HEADER_FROM_DIFFERENT_DOMAINS,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=1739550604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pI/TL50Z63eMQ7horaAZBVF8MfzPrEZ5Vy/TxUzgs9c=; b=Pux4TI8OeT23TVQ49K+qAnAM+LRPubwCYEBC7ptWGCj9zsfCuRJmFVijpM2ZSUXimwZoxE b2WHNbSeDypW5Yd6hqkwhHu9raszeAPX86Gqbviu/X4m2bExwYlpMhIBq0VWYwBJvrzrUb r/XXRplyxT08asDtXQdZEjLoR/z/BmY= X-MC-Unique: ShtG-BzoOSu5ik-DoEuv3A-1 X-Mimecast-MFC-AGG-ID: ShtG-BzoOSu5ik-DoEuv3A_1739550602 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 06/13] qemuValidateCheckSCSIControllerIOThreads: Return '0' and '-1' instead of bools Date: Fri, 14 Feb 2025 17:29:40 +0100 Message-ID: <3cea9895a8a9000ab9bd9ff584878dd91731f5df.1739550300.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6wkkOnlsIqaquo8IfRn-Hs9moo5wtkjuZdltGo2b1I4_1739550602 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7EZTV3WWTNNGKQ4I6BRC66WN4KUCNTEW X-Message-ID-Hash: 7EZTV3WWTNNGKQ4I6BRC66WN4KUCNTEW X-MailFrom: pkrempa@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 CC: Stefan Hajnoczi 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1739550790418019100 Content-Type: text/plain; charset="utf-8" The function reports libvirt errors so stick with the usual '0' and '-1' return values. Signed-off-by: Peter Krempa --- src/qemu/qemu_validate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8ac3e65e9d..2185e31a27 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3599,19 +3599,19 @@ qemuValidateDomainDeviceDefControllerIDE(const virD= omainControllerDef *controlle * Returns true if either supported or there are no iothreads for controll= er; * otherwise, returns false if configuration is not quite right. */ -static bool +static int qemuValidateCheckSCSIControllerIOThreads(const virDomainControllerDef *con= troller, const virDomainDef *def) { if (!controller->iothread) - return true; + return 0; if (controller->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && controller->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && controller->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio-scsi IOThreads only available for virtio = pci and virtio ccw controllers")); - return false; + return -1; } /* Can we find the controller iothread in the iothreadid list? */ @@ -3619,10 +3619,10 @@ qemuValidateCheckSCSIControllerIOThreads(const virD= omainControllerDef *controlle virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("controller iothread '%1$u' not defined in iothre= adid"), controller->iothread); - return false; + return -1; } - return true; + return 0; } @@ -3634,7 +3634,7 @@ qemuValidateDomainDeviceDefControllerSCSI(const virDo= mainControllerDef *controll case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL: - if (!qemuValidateCheckSCSIControllerIOThreads(controller, def)) + if (qemuValidateCheckSCSIControllerIOThreads(controller, def) = < 0) return -1; break; --=20 2.48.1