From nobody Fri Dec 19 07:49:53 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 17393349553261002.4293972572185; Tue, 11 Feb 2025 20:35:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id BCF1A1769; Tue, 11 Feb 2025 23:35:54 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 71124167C; Tue, 11 Feb 2025 23:30:00 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3463E1768; Tue, 11 Feb 2025 23:29:55 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 6DD2F14B8 for ; Tue, 11 Feb 2025 23:29:26 -0500 (EST) Received: from mx-prod-mc-08.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-668-RRa0iJMzMKqtQ1dRsJz_Lg-1; Tue, 11 Feb 2025 23:29:24 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BCE11800871 for ; Wed, 12 Feb 2025 04:29:23 +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 E9B841800570 for ; Wed, 12 Feb 2025 04:29:22 +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_H2,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=1739334566; 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=TcGrPzsCnqKXsmCvMtolh6SGVC9oQd5yRwpOFS3WRTc=; b=LqEZMNXwehA/XzyeX5Uo5NNh02B83EsoDDnROrQuuKL0FS+dHoE7P0AYF3uD3kOV2RIn4G O3ZyuFhUXu3WTOE9L8HDzSsgr2SVq7yCXLPyI1oi7bOZags4BhkPIvRqNJs8tZBVtF6e+4 ++ZX2owncwjfIt5pGadjsZN6FTmgGyo= X-MC-Unique: RRa0iJMzMKqtQ1dRsJz_Lg-1 X-Mimecast-MFC-AGG-ID: RRa0iJMzMKqtQ1dRsJz_Lg From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 16/17] conf: change virDomainDefMaybeAddSmartcardController() to return void Date: Tue, 11 Feb 2025 23:29:09 -0500 Message-ID: <20250212042910.548504-17-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: csdWvbyE9Gl3AzXzCNc4jWTBa0Zfl369S1PgNB9vs5U_1739334563 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NX6UUUX54SRQTS5JTC34BSPCSKZ5RXOB X-Message-ID-Hash: NX6UUUX54SRQTS5JTC34BSPCSKZ5RXOB 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: 1739334956509019000 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe816dfd6d..c4bdf58788 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22302,7 +22302,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomai= nDef *def) } =20 =20 -static int +static void virDomainDefMaybeAddSmartcardController(virDomainDef *def) { /* Look for any smartcard devs */ @@ -22333,8 +22333,6 @@ virDomainDefMaybeAddSmartcardController(virDomainDe= f *def) =20 virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_CCI= D, idx, -1); } - - return 0; } =20 /* @@ -22356,10 +22354,7 @@ virDomainDefAddImplicitControllers(virDomainDef *d= ef) VIR_DOMAIN_DISK_BUS_SATA); =20 virDomainDefMaybeAddVirtioSerialController(def); - - if (virDomainDefMaybeAddSmartcardController(def) < 0) - return -1; - + virDomainDefMaybeAddSmartcardController(def); virDomainDefMaybeAddHostdevSCSIcontroller(def); =20 return 0; --=20 2.47.1