From nobody Fri Dec 19 07:50:29 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 1739334875608744.8425638122205; Tue, 11 Feb 2025 20:34:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 96EDAE5A; Tue, 11 Feb 2025 23:34:34 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C277F16F0; Tue, 11 Feb 2025 23:29:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 65FD9147F; Tue, 11 Feb 2025 23:29:43 -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 7DB0A1667 for ; Tue, 11 Feb 2025 23:29:24 -0500 (EST) Received: from mx-prod-mc-03.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-99-H1KINN6NPcqT74QLjsQwDg-1; Tue, 11 Feb 2025 23:29:22 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 366BA19560AE for ; Wed, 12 Feb 2025 04:29:21 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.64.63]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BC4EE1800570 for ; Wed, 12 Feb 2025 04:29:20 +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=1739334564; 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=5VjQeIwQiJyNGbK8hLY1/ZvrZXx3XhK7xPovbVBa/GY=; b=JO/2f4krP5O6OWHM+jTJPDuKFRQ4aG6drbVVbURXV+7q1QDtNey4tc5v0q1Obm7eNJEaNR yT92qXRYVauM8VWurOIssmtXkFK28ssE2vDFhIiwjnyj8JvXiCwYQeoNXk2FANPXp0SDHD 4VeY3hKl53okM5jlCCK5Jj4HQ4SxsJE= X-MC-Unique: H1KINN6NPcqT74QLjsQwDg-1 X-Mimecast-MFC-AGG-ID: H1KINN6NPcqT74QLjsQwDg_1739334561 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 13/17] conf: change virDomainDefMaybeAddHostdevSCSIcontroller() to return void Date: Tue, 11 Feb 2025 23:29:06 -0500 Message-ID: <20250212042910.548504-14-laine@redhat.com> In-Reply-To: <20250212042910.548504-1-laine@redhat.com> References: <20250212042910.548504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ywgEiaebf2EjfTel2lRTSNO-x-Il2ydOb_FloPz_f1c_1739334561 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZQF76SKWDS6IEYIA3TMBPVA7GUL36XLS X-Message-ID-Hash: ZQF76SKWDS6IEYIA3TMBPVA7GUL36XLS X-MailFrom: laine@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1739334877697019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 611b6a44c8..d3e95a2f92 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17200,7 +17200,7 @@ virDomainFeaturesDefParse(virDomainDef *def, } =20 =20 -static int +static void virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDef *def) { /* Look for any hostdev scsi dev */ @@ -17227,12 +17227,10 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDoma= inDef *def) } =20 if (maxController =3D=3D -1) - return 0; + return; =20 for (i =3D 0; i <=3D maxController; i++) virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCS= I, i, newModel); - - return 0; } =20 =20 @@ -19497,8 +19495,7 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, * post processing) because that will result in the failure to * load the controller during hostdev hotplug. */ - if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) - return NULL; + virDomainDefMaybeAddHostdevSCSIcontroller(def); } VIR_FREE(nodes); =20 @@ -22379,8 +22376,7 @@ virDomainDefAddImplicitControllers(virDomainDef *de= f) if (virDomainDefMaybeAddSmartcardController(def) < 0) return -1; =20 - if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) - return -1; + virDomainDefMaybeAddHostdevSCSIcontroller(def); =20 return 0; } --=20 2.47.1