From nobody Fri Dec 19 00:03:54 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 1739334618425181.1840974036278; Tue, 11 Feb 2025 20:30:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C0E4817C1; Tue, 11 Feb 2025 23:30:17 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 65A2814A0; Tue, 11 Feb 2025 23:29:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AFC98145E; Tue, 11 Feb 2025 23:29:16 -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 2A4521467 for ; Tue, 11 Feb 2025 23:29:16 -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-529-kp6nP42vPVaRcX12N-lOMQ-1; Tue, 11 Feb 2025 23:29:13 -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 971BB19560AE for ; Wed, 12 Feb 2025 04:29:12 +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 29AA1180087B for ; Wed, 12 Feb 2025 04:29:12 +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=1739334555; 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=MyZ1GrKUOzN9Is176VROpjdLNryp5WYhbFSW5RpRO9A=; b=UXxK3a1tVin2nnQoQ8WMC9JC6gbD2nSCb8udAtWDapvev8hKQCpa6mBMelq/CvstHzy1Lh k5eJXK5TvwYRlhFM/hGckmKwNRiKwLR+NWIEMcUq6PwmEDRizLNklT9Hgba0udPuFzpIVy ceHpV6RiFHhocEVBa4RuX4i0c6ynvIY= X-MC-Unique: kp6nP42vPVaRcX12N-lOMQ-1 X-Mimecast-MFC-AGG-ID: kp6nP42vPVaRcX12N-lOMQ From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 01/17] conf: change virDomainHostdevInsert() to return void Date: Tue, 11 Feb 2025 23:28:54 -0500 Message-ID: <20250212042910.548504-2-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: vjUd3bRNC_1Tc3pi_trvgDXqQ9FzMaB4aha6m7552yI_1739334552 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: H7ZMH5V3W5J7IOG2OXECU3YO3ULZUPLC X-Message-ID-Hash: H7ZMH5V3W5J7IOG2OXECU3YO3ULZUPLC 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: 1739334619258019000 Content-Type: text/plain; charset="utf-8"; x-default="true" We haven't checked for memalloc failure in many years, and that was the only reason this function would have ever failed. Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 15 +++++---------- src/conf/domain_conf.h | 2 +- src/libxl/libxl_domain.c | 5 +---- src/libxl/libxl_driver.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +-- 7 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 45c2cd09f1..8751e1ef06 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14465,12 +14465,10 @@ virDomainChrTargetTypeToString(int deviceType, return type; } =20 -int +void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev) { VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev); - - return 0; } =20 virDomainHostdevDef * @@ -14886,9 +14884,8 @@ virDomainDiskRemoveByName(virDomainDef *def, const = char *name) int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) { /* hostdev net devices must also exist in the hostdevs array */ - if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainHostdevInsert(def, &net->data.hostdev.def) < 0) - return -1; + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) + virDomainHostdevInsert(def, &net->data.hostdev.def); =20 VIR_APPEND_ELEMENT(def->nets, def->nnets, net); return 0; @@ -19281,10 +19278,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, * where the actual network type is already known to be * hostdev) must also be in the hostdevs array. */ - if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_HOST= DEV && - virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net))= < 0) { - return NULL; - } + if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_HOST= DEV) + virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)); } VIR_FREE(nodes); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ba1a495764..db49567313 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3994,7 +3994,7 @@ virDomainNetDef *virDomainNetRemove(virDomainDef *def= , size_t i); virDomainNetDef *virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDe= f *net); void virDomainNetRemoveHostdev(virDomainDef *def, virDomainNetDef *net); =20 -int virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev= ); +void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostde= v); virDomainHostdevDef * virDomainHostdevRemove(virDomainDef *def, size_t i); int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index a049cdb30f..6805160923 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1014,10 +1014,7 @@ libxlNetworkPrepareDevices(virDomainDef *def) /* Each type=3D'hostdev' network device must also have a * corresponding entry in the hostdevs array. */ - virDomainHostdevDef *hostdev =3D virDomainNetGetActualHostdev(= net); - - if (virDomainHostdevInsert(def, hostdev) < 0) - return -1; + virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)); } } =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 494b1ad9bc..f2bb6893c4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3590,8 +3590,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, vi= rDomainDeviceDef *dev) return -1; } =20 - if (virDomainHostdevInsert(vmdef, hostdev) < 0) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev =3D NULL; break; =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4740aeed52..9301aedf58 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2992,8 +2992,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuratio= n")); return -1; } - if (virDomainHostdevInsert(vmdef, hostdev) < 0) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev =3D NULL; ret =3D 0; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d2eddbd9ae..0a7c3588e2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6745,8 +6745,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuratio= n")); return -1; } - if (virDomainHostdevInsert(vmdef, hostdev)) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev =3D NULL; break; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6db48b0e7b..9cfd40993a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5909,8 +5909,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm) if (qemuDomainPrepareHostdev(hostdev, priv) < 0) return -1; =20 - if (virDomainHostdevInsert(def, hostdev) < 0) - return -1; + virDomainHostdevInsert(def, hostdev); } } return 0; --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334587418582.3756438520692; Tue, 11 Feb 2025 20:29:47 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 364FF16F0; Tue, 11 Feb 2025 23:29:46 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DFDF8146E; Tue, 11 Feb 2025 23:29:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8DDED1469; Tue, 11 Feb 2025 23:29:16 -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 E42DE145E for ; Tue, 11 Feb 2025 23:29:15 -0500 (EST) Received: from mx-prod-mc-05.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-75-6LGEe7INOV6FiQCN3ZBurA-1; Tue, 11 Feb 2025 23:29:14 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 55B9A1956094 for ; Wed, 12 Feb 2025 04:29:13 +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 DD939180087F for ; Wed, 12 Feb 2025 04:29:12 +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=1739334555; 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=ptWbmjwdUHYRtdT/LKnVBzCQiSFJGuUbfQqbG1eqmik=; b=NSIQGB7EBYVaySpayp8TR9o0jGekORO4pCtIU1kZtZaG1TIvwosAG7naG3OpR7bjWT6Eaj pLYy0TWr6UJsIfq1Tpe4BTZasPqKCUqF8zQH+v0WSf/O2OtVvvr/73QrxWKAcs3FxKAxCh sTp48klwhCB0KlkcgWGvqc2SuSBvyzc= X-MC-Unique: 6LGEe7INOV6FiQCN3ZBurA-1 X-Mimecast-MFC-AGG-ID: 6LGEe7INOV6FiQCN3ZBurA_1739334553 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 02/17] conf: change virDomainNetInsert() to return void Date: Tue, 11 Feb 2025 23:28:55 -0500 Message-ID: <20250212042910.548504-3-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: pinadsCSyRuKg-rYKxTttgt8mC3DpMkNKMfFDMIh62o_1739334553 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6D6P6RCQXPHRYHXJNBJZS5TKDLJ4U2HE X-Message-ID-Hash: 6D6P6RCQXPHRYHXJNBJZS5TKDLJ4U2HE 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: 1739334590117019100 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 | 4 ++-- src/conf/domain_conf.h | 2 +- src/libxl/libxl_driver.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 5 +---- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8751e1ef06..1882054c7b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14881,14 +14881,14 @@ virDomainDiskRemoveByName(virDomainDef *def, cons= t char *name) return virDomainDiskRemove(def, idx); } =20 -int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) +void +virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) { /* hostdev net devices must also exist in the hostdevs array */ if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) virDomainHostdevInsert(def, &net->data.hostdev.def); =20 VIR_APPEND_ELEMENT(def->nets, def->nnets, net); - return 0; } =20 /** diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index db49567313..37298ca937 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3984,7 +3984,7 @@ int virDomainNetFindIdx(virDomainDef *def, virDomainN= etDef *net); virDomainNetDef *virDomainNetFind(virDomainDef *def, const char *device); virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifn= ame); bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net); -int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); +void virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef = *newnet); bool virDomainNetBackendIsEqual(virDomainNetBackend *src, virDomainNetBackend *dst); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f2bb6893c4..45d15df8b8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3565,8 +3565,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, vi= rDomainDeviceDef *dev) virMacAddrFormat(&net->mac, mac)); return -1; } - if (virDomainNetInsert(vmdef, net)) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net =3D NULL; break; =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9301aedf58..5795293079 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2979,8 +2979,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, =20 case VIR_DOMAIN_DEVICE_NET: net =3D dev->data.net; - if (virDomainNetInsert(vmdef, net) < 0) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net =3D NULL; ret =3D 0; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a7c3588e2..4a248cbafe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6699,7 +6699,6 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainXMLOption *xmlopt) { virDomainDiskDef *disk; - virDomainNetDef *net; virDomainSoundDef *sound; virDomainHostdevDef *hostdev; virDomainLeaseDef *lease; @@ -6726,9 +6725,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, break; =20 case VIR_DOMAIN_DEVICE_NET: - net =3D dev->data.net; - if (virDomainNetInsert(vmdef, net)) - return -1; + virDomainNetInsert(vmdef, dev->data.net); dev->data.net =3D NULL; break; =20 --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334639929316.9836806869158; Tue, 11 Feb 2025 20:30:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5CB2014B8; Tue, 11 Feb 2025 23:30:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6F7F9163F; Tue, 11 Feb 2025 23:29:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CB7481301; Tue, 11 Feb 2025 23:29:17 -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 5551A1301 for ; Tue, 11 Feb 2025 23:29:17 -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-93-LJPnQRW_PiS_Hfcx0guttA-1; Tue, 11 Feb 2025 23:29:15 -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 0B9E81800873 for ; Wed, 12 Feb 2025 04:29:14 +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 94985180087B for ; Wed, 12 Feb 2025 04:29:13 +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=1739334557; 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=QoKl1ynRR3ESy0L8o6sHd301wTbzRPaGihFEh8R6jbc=; b=d4CCUfvelaax/MExwXzeNPEJDhXantfVS6C/v3XZE/eqK0dqzLPIR7qUfAg1NJsSYca/Yg /NOIN5bC/7ZUxId/SPsphyi3LjmxTYiXRHbXooiV8I1+M7PXeet6lvhgFe3IV3D1tr9+N8 q0j+eQ0ElH44Exdxe5ZP50XMkVvVOzE= X-MC-Unique: LJPnQRW_PiS_Hfcx0guttA-1 X-Mimecast-MFC-AGG-ID: LJPnQRW_PiS_Hfcx0guttA_1739334554 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 03/17] conf: change virDomainFSInsert() to return void Date: Tue, 11 Feb 2025 23:28:56 -0500 Message-ID: <20250212042910.548504-4-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: P4nI0kQcQ4Yzwf_DAqDXs5B_mS9L9XCuZM_BKKA3JYs_1739334554 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Y7PDPGJ64G3PU2JU5O252XMZ6GTZEZ7K X-Message-ID-Hash: Y7PDPGJ64G3PU2JU5O252XMZ6GTZEZ7K 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: 1739334641320019000 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 | 4 +--- src/conf/domain_conf.h | 2 +- src/qemu/qemu_driver.c | 3 +-- src/vz/vz_sdk.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1882054c7b..b5b15b7768 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29205,12 +29205,10 @@ virDiskNameToBusDeviceIndex(virDomainDiskDef *dis= k, return 0; } =20 -int +void virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs) { VIR_APPEND_ELEMENT(def->fss, def->nfss, fs); - - return 0; } =20 virDomainFSDef * diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 37298ca937..cb19f0fb29 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4123,7 +4123,7 @@ int virDiskNameToBusDeviceIndex(virDomainDiskDef *dis= k, =20 virDomainFSDef *virDomainGetFilesystemForTarget(virDomainDef *def, const char *target); -int virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs); +void virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs); int virDomainFSIndexByName(virDomainDef *def, const char *name); virDomainFSDef *virDomainFSRemove(virDomainDef *def, size_t i); ssize_t virDomainFSDefFind(virDomainDef *def, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4a248cbafe..d295f24cb3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6790,8 +6790,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, return -1; } =20 - if (virDomainFSInsert(vmdef, fs) < 0) - return -1; + virDomainFSInsert(vmdef, fs); dev->data.fs =3D NULL; break; =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index b20d454fb8..688c9d1ebc 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -801,8 +801,7 @@ prlsdkAddDomainHardDisksInfo(struct _vzDriver *driver, = PRL_HANDLE sdkdom, virDom if (prlsdkGetFSInfo(hdd, fs) < 0) goto error; =20 - if (virDomainFSInsert(def, fs) < 0) - goto error; + virDomainFSInsert(def, fs); =20 fs =3D NULL; PrlHandle_Free(hdd); --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334671897135.10645939172002; Tue, 11 Feb 2025 20:31:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5091A16E8; Tue, 11 Feb 2025 23:31:11 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B04241489; Tue, 11 Feb 2025 23:29:25 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CC451145E; Tue, 11 Feb 2025 23:29:17 -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 59FFA1466 for ; Tue, 11 Feb 2025 23:29:17 -0500 (EST) Received: from mx-prod-mc-01.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-629-Q8h1qQa2PTW_yDjxmzR1pA-1; Tue, 11 Feb 2025 23:29:15 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D05091956095 for ; Wed, 12 Feb 2025 04:29:14 +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 64DE01800570 for ; Wed, 12 Feb 2025 04:29:14 +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=1739334557; 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=FSca39Jlhd7fAzz2hb0aHieny13NrsPBwHdjtosSU0U=; b=LVUehWhd2HO+y5jZunqfLCrC5Nzw7I4/v2y16adDbyIpS4SPuqxJqykjUUEBwHcfqJQm+p XhpttFiWfnImCpShrF5Dv2scXqr/GSK++NnwydLmugNVJEyp2HnCTU/hY0OeGEGBf5S0cG rI6YNwZqMCvMNaLv+2wfi1X/q7SHUvo= X-MC-Unique: Q8h1qQa2PTW_yDjxmzR1pA-1 X-Mimecast-MFC-AGG-ID: Q8h1qQa2PTW_yDjxmzR1pA From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 04/17] conf: change virDomainShmemDefInsert() to return void Date: Tue, 11 Feb 2025 23:28:57 -0500 Message-ID: <20250212042910.548504-5-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: uKeQUT5si-iuiOMTx7ApUTVWZnGsFNXhVq-x9T_mouA_1739334555 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IWMBTKDGT5Q22L4NCT2FJPE2AURXI3QF X-Message-ID-Hash: IWMBTKDGT5Q22L4NCT2FJPE2AURXI3QF 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: 1739334673429019000 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 | 4 +--- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_driver.c | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b5b15b7768..2e74f75a13 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15968,13 +15968,11 @@ virDomainRedirdevDefRemove(virDomainDef *def, siz= e_t idx) } =20 =20 -int +void virDomainShmemDefInsert(virDomainDef *def, virDomainShmemDef *shmem) { VIR_APPEND_ELEMENT(def->shmems, def->nshmems, shmem); - - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cb19f0fb29..0dd2d6f1d2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4203,8 +4203,8 @@ virDomainMemoryFindByDeviceAlias(virDomainDef *def, const char *alias) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 -int virDomainShmemDefInsert(virDomainDef *def, virDomainShmemDef *shmem) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +void virDomainShmemDefInsert(virDomainDef *def, virDomainShmemDef *shmem) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); bool virDomainShmemDefEquals(virDomainShmemDef *src, virDomainShmemDef *ds= t) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; ssize_t virDomainShmemDefFind(virDomainDef *def, virDomainShmemDef *shmem) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d295f24cb3..f1be2ca2d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6824,8 +6824,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuratio= n")); return -1; } - if (virDomainShmemDefInsert(vmdef, shmem) < 0) - return -1; + virDomainShmemDefInsert(vmdef, shmem); dev->data.shmem =3D NULL; break; =20 --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 173933471902631.989818245411243; Tue, 11 Feb 2025 20:31:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 14CACD61; Tue, 11 Feb 2025 23:31:58 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B9216155E; Tue, 11 Feb 2025 23:29:29 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id F1F551466; Tue, 11 Feb 2025 23:29:18 -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 7435B145E for ; Tue, 11 Feb 2025 23:29:18 -0500 (EST) Received: from mx-prod-mc-04.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-594-pRPUJAmrOkScSNzUNcenMQ-1; Tue, 11 Feb 2025 23:29:16 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A6CB81955DB8 for ; Wed, 12 Feb 2025 04:29:15 +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 1C779180087B for ; Wed, 12 Feb 2025 04:29:14 +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=1739334558; 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=vFL2+V7QuUIjTstOVvHGDy3N1PoGJrekoQQyTgfSfDc=; b=SzKV8PJRpygzD4dr4qzRGVHtDIRCXVHD3ILr8IRtLm/gNfzD+9aE9o6hcw+rQmci3ks+eE sY0ItqMJQ+brXOjBkl9WR81k75eD9WaXUDCCY0NDXyEv8q0NnL8uli9+lxaak7DOmmWcLb SpmZlxbYMnUrKRZTViV/sNVeqzSfNlc= X-MC-Unique: pRPUJAmrOkScSNzUNcenMQ-1 X-Mimecast-MFC-AGG-ID: pRPUJAmrOkScSNzUNcenMQ From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 05/17] conf: change virDomainDefMaybeAddInput() to return void Date: Tue, 11 Feb 2025 23:28:58 -0500 Message-ID: <20250212042910.548504-6-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: EDKkFxq1l7h4wgRP60zoiEgZsqlXTbUuGMb-1fqRJ1E_1739334555 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TUCMOPFJCFKUEECRTC33VMFLINLSUNWP X-Message-ID-Hash: TUCMOPFJCFKUEECRTC33VMFLINLSUNWP 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: 1739334721274019100 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 | 6 ++---- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 11 ++--------- src/qemu/qemu_postparse.c | 27 ++++++--------------------- src/vz/vz_driver.c | 11 ++--------- src/vz/vz_sdk.c | 11 ++--------- 6 files changed, 15 insertions(+), 53 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e74f75a13..b14712997b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16548,7 +16548,7 @@ virDomainDefMaybeAddController(virDomainDef *def, } =20 =20 -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus) @@ -16559,7 +16559,7 @@ virDomainDefMaybeAddInput(virDomainDef *def, for (i =3D 0; i < def->ninputs; i++) { if (def->inputs[i]->type =3D=3D type && def->inputs[i]->bus =3D=3D bus) - return 0; + return; } =20 input =3D g_new0(virDomainInputDef, 1); @@ -16568,8 +16568,6 @@ virDomainDefMaybeAddInput(virDomainDef *def, input->bus =3D bus; =20 VIR_APPEND_ELEMENT(def->inputs, def->ninputs, input); - - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0dd2d6f1d2..1edc3679cd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4370,7 +4370,7 @@ virDomainDefMaybeAddController(virDomainDef *def, virDomainControllerType type, int idx, int model); -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 3a64f565f7..c9c8ed2fde 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2400,15 +2400,8 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) implicitInputBus =3D VIR_DOMAIN_INPUT_BUS_PS2; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - implicitInputBus) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - implicitInputBus) < 0) - return -1; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, implicitIn= putBus); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInpu= tBus); =20 return 0; } diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 1f9077982a..53151eef75 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1095,15 +1095,8 @@ qemuDomainDefAddImplicitInputDevice(virDomainDef *de= f, { if (virQEMUCapsSupportsI8042(qemuCaps, def) && def->features[VIR_DOMAIN_FEATURE_PS2] !=3D VIR_TRISTATE_SWITCH_OFF= ) { - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DO= MAIN_INPUT_BUS_PS2); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMA= IN_INPUT_BUS_PS2); } =20 return 0; @@ -1419,19 +1412,11 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *drive= r, addDefaultUSBMouse =3D false; } =20 - if (addDefaultUSBKBD && - def->ngraphics > 0 && - virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + if (addDefaultUSBKBD && def->ngraphics > 0) + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMA= IN_INPUT_BUS_USB); =20 - if (addDefaultUSBMouse && - def->ngraphics > 0 && - virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + if (addDefaultUSBMouse && def->ngraphics > 0) + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DO= MAIN_INPUT_BUS_USB); =20 if (addPanicDevice) { virDomainPanicModel defaultModel =3D qemuDomainDefaultPanicModel(d= ef); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 4edea4bf18..571735f940 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -219,15 +219,8 @@ vzDomainDefAddDefaultInputDevices(virDomainDef *def) if (def->ngraphics =3D=3D 0) return 0; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return -1; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus); =20 return 0; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 688c9d1ebc..c64d0b73e5 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1848,15 +1848,8 @@ prlsdkLoadDomain(struct _vzDriver *driver, int bus =3D IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; =20 - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return NULL; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return NULL; + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus); + virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus); } =20 if (!dom) { --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334739331674.4075448410559; Tue, 11 Feb 2025 20:32:19 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5652115FB; Tue, 11 Feb 2025 23:32:18 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 86AE3159D; Tue, 11 Feb 2025 23:29:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8CDC4145E; Tue, 11 Feb 2025 23:29:19 -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 1429E1301 for ; Tue, 11 Feb 2025 23:29:19 -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-683-rEG1_JQ4Mpeqj4EANd6AHA-1; Tue, 11 Feb 2025 23:29:17 -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 3E7E31800570 for ; Wed, 12 Feb 2025 04:29:16 +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 C7E0718008D8 for ; Wed, 12 Feb 2025 04:29:15 +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=1739334558; 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=aNSpnBWuuXJLF02nyZFnafj95GfuT/BdVkKnTpi2VOI=; b=YjPiDpjhInhsfkCQGfbaX9Qk3ZJH0GZfeAf3cFnthDCGyLpJsyuL5XNmsZ1jclOz9JHh1a mgftop+M6Hjpe71Aa9gviAQJdluwJKROe6P/Nh01wP58pCrDIi7ZoFn+Fy4/Zn4F34AHog gUCRCtru9NhLK16VVC/ERQYl9Fjvkgw= X-MC-Unique: rEG1_JQ4Mpeqj4EANd6AHA-1 X-Mimecast-MFC-AGG-ID: rEG1_JQ4Mpeqj4EANd6AHA From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 06/17] libxl: change xenDomainDefAddImplicitInputDevice() to return void Date: Tue, 11 Feb 2025 23:28:59 -0500 Message-ID: <20250212042910.548504-7-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: aWJbmqNqxAS66lpqbg7of54mT4UAek6JpuFxjd-1ads_1739334556 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z6ZXEGUHFCCGDDTJQGKHTGYQH2KTUGOC X-Message-ID-Hash: Z6ZXEGUHFCCGDDTJQGKHTGYQH2KTUGOC 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: 1739334741275019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/libxl/libxl_domain.c | 3 +-- src/libxl/xen_common.c | 4 +--- src/libxl/xen_common.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 6805160923..c7ba5636c4 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -266,8 +266,7 @@ libxlDomainDefPostParse(virDomainDef *def, } =20 /* add implicit input devices */ - if (xenDomainDefAddImplicitInputDevice(def) < 0) - return -1; + xenDomainDefAddImplicitInputDevice(def); =20 /* For x86_64 HVM */ if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM && diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index c9c8ed2fde..d82e33600f 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2392,7 +2392,7 @@ xenFormatConfigCommon(virConf *conf, } =20 =20 -int +void xenDomainDefAddImplicitInputDevice(virDomainDef *def) { virDomainInputBus implicitInputBus =3D VIR_DOMAIN_INPUT_BUS_XEN; @@ -2402,6 +2402,4 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) =20 virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, implicitIn= putBus); virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInpu= tBus); - - return 0; } diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index 95408fa896..c52a4f1232 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -65,4 +65,4 @@ int xenFormatConfigCommon(virConf *conf, =20 char *xenMakeIPList(virNetDevIPInfo *guestIP); =20 -int xenDomainDefAddImplicitInputDevice(virDomainDef *def); +void xenDomainDefAddImplicitInputDevice(virDomainDef *def); --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334757915570.8856588518629; Tue, 11 Feb 2025 20:32:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E7C7A1492; Tue, 11 Feb 2025 23:32:36 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8652C170E; Tue, 11 Feb 2025 23:29:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 527A91499; Tue, 11 Feb 2025 23:29:20 -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 B7CAF1301 for ; Tue, 11 Feb 2025 23:29:19 -0500 (EST) Received: from mx-prod-mc-04.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-583-YHMo9OCVM5ehQgdh22AYww-1; Tue, 11 Feb 2025 23:29:17 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0007D1955DD0 for ; Wed, 12 Feb 2025 04:29:16 +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 7E35B1800570 for ; Wed, 12 Feb 2025 04:29:16 +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=1739334559; 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=fmn6oiLnUi4psRdCb38V7jNZH90WqZ2oiaM+X1FwnoA=; b=aT1LCjofl33YZQUFZ0ZrEiZfNrTopjebTSx0XEIRoIImfxwRmIbFmM2c6G/CQ9myGeejlS FpoYiVMhxMmSXouYL3km6S1PXv2l/Us4o/xr07QNCQJu8+HAgQ30r2VL9M2jJiz+WCoHvX Vu5MOnqmhHw3o7NUSPHVHcG7FKN3VhY= X-MC-Unique: YHMo9OCVM5ehQgdh22AYww-1 X-Mimecast-MFC-AGG-ID: YHMo9OCVM5ehQgdh22AYww From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 07/17] conf: change qemuDomainDefAddImplicitInputDevice() to return void Date: Tue, 11 Feb 2025 23:29:00 -0500 Message-ID: <20250212042910.548504-8-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: DeboG36daxegG-vdwMm1Xb_4hHJZCGzYeRQCCd59MOM_1739334557 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 234PCSU33N2DF4HKFJA5VT3L343NSYAD X-Message-ID-Hash: 234PCSU33N2DF4HKFJA5VT3L343NSYAD 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: 1739334759326019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/qemu/qemu_postparse.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 53151eef75..0de48916f4 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1089,7 +1089,7 @@ qemuDomainDefBootPostParse(virDomainDef *def, } =20 =20 -static int +static void qemuDomainDefAddImplicitInputDevice(virDomainDef *def, virQEMUCaps *qemuCaps) { @@ -1098,8 +1098,6 @@ qemuDomainDefAddImplicitInputDevice(virDomainDef *def, virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DO= MAIN_INPUT_BUS_PS2); virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMA= IN_INPUT_BUS_PS2); } - - return 0; } =20 =20 @@ -1194,8 +1192,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, bool addIOMMU =3D false; =20 /* add implicit input devices */ - if (qemuDomainDefAddImplicitInputDevice(def, qemuCaps) < 0) - return -1; + qemuDomainDefAddImplicitInputDevice(def, qemuCaps); =20 /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334786943934.3513549920643; Tue, 11 Feb 2025 20:33:06 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E325D1341; Tue, 11 Feb 2025 23:33:05 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 828F1164A; Tue, 11 Feb 2025 23:29:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0EA56150E; Tue, 11 Feb 2025 23:29:28 -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 AD47D14C9 for ; Tue, 11 Feb 2025 23:29:20 -0500 (EST) Received: from mx-prod-mc-01.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-596-uWPowGviNe6X-O9S4miw4Q-1; Tue, 11 Feb 2025 23:29:18 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D16D41956095 for ; Wed, 12 Feb 2025 04:29:17 +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 3F983180087B for ; Wed, 12 Feb 2025 04:29:17 +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=1739334560; 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=W6A8MsjvHdKWS8fQUHfZYJTtp6z7fqHBUegMmode7fg=; b=Cxw2DBiDZIkbUfUzAVWdsAKIxLQS3Y+XLYZdqep3WpwF6vsqV6fMA7BlauttEldBA+VfOh TdlYFeiqM8H6HqI8z5Br+GDFKE7rkFzqTK7s9mrAmbVoFAYeq8ucq5jNALkW45niLA1AMV FLlmJch36NTDLuhQn6UpVJ8GVNn+E5k= X-MC-Unique: uWPowGviNe6X-O9S4miw4Q-1 X-Mimecast-MFC-AGG-ID: uWPowGviNe6X-O9S4miw4Q From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 08/17] conf: stop checking for NULL return from virDomainControllerDefNew() Date: Tue, 11 Feb 2025 23:29:01 -0500 Message-ID: <20250212042910.548504-9-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: BUKn0SLsKVdnh9Gh7e5om_qlgdUZ2GtyRhp6ieYFIEQ_1739334557 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BF6UTDJPFGRP6PGYYY3ZVVVXQDGMCBH4 X-Message-ID-Hash: BF6UTDJPFGRP6PGYYY3ZVVVXQDGMCBH4 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: 1739334789427019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail, so the caller doesn't need to check the return. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 8 ++------ src/hyperv/hyperv_driver.c | 6 +----- src/libxl/libxl_conf.c | 4 +--- src/libxl/libxl_driver.c | 5 +---- src/libxl/xen_xl.c | 4 +--- 5 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b14712997b..ce7501f2b3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8571,8 +8571,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xm= lopt, VIR_XML_PROP_NONE, &type) < 0) return NULL; =20 - if (!(def =3D virDomainControllerDefNew(type))) - return NULL; + def =3D virDomainControllerDefNew(type); =20 if ((model =3D virXMLPropString(node, "model"))) { if ((def->model =3D virDomainControllerModelTypeFromString(def, mo= del)) < 0) { @@ -16459,10 +16458,7 @@ virDomainDefAddController(virDomainDef *def, int idx, int model) { - virDomainControllerDef *cont; - - if (!(cont =3D virDomainControllerDefNew(type))) - return NULL; + virDomainControllerDef *cont =3D virDomainControllerDefNew(type); =20 if (idx < 0) idx =3D virDomainControllerFindUnusedIndex(def, type); diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 43ccb9cbd7..66286cc756 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1174,13 +1174,9 @@ hypervDomainDefAppendController(virDomainDef *def, int idx, virDomainControllerType controllerType) { - virDomainControllerDef *controller =3D NULL; - - if (!(controller =3D virDomainControllerDefNew(controllerType))) - return -1; + virDomainControllerDef *controller =3D virDomainControllerDefNew(contr= ollerType); =20 controller->idx =3D idx; - VIR_APPEND_ELEMENT(def->controllers, def->ncontrollers, controller); =20 return 0; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index c404226e43..e06655605b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -2102,9 +2102,7 @@ libxlMakeDefaultUSBControllers(virDomainDef *def, x_controllers =3D g_new0(libxl_device_usbctrl, ncontrollers); =20 for (i =3D 0; i < ncontrollers; i++) { - if (!(l_controller =3D virDomainControllerDefNew(VIR_DOMAIN_CONTRO= LLER_TYPE_USB))) - goto error; - + l_controller =3D virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_T= YPE_USB); l_controller->model =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2; l_controller->idx =3D i; l_controller->opts.usbopts.ports =3D 8; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 45d15df8b8..7d214a07d3 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3221,10 +3221,7 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *d= river, =20 if (ports <=3D usbdevs) { /* no free ports, we will create a new usb controller */ - virDomainControllerDef *controller; - - if (!(controller =3D virDomainControllerDefNew(VIR_DOMAIN_CONTROLL= ER_TYPE_USB))) - goto cleanup; + virDomainControllerDef *controller =3D virDomainControllerDefNew(V= IR_DOMAIN_CONTROLLER_TYPE_USB); =20 controller->model =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2; controller->idx =3D -1; diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 53f6871efc..30dffcac20 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -861,9 +861,7 @@ xenParseXLUSBController(virConf *conf, virDomainDef *de= f) else usbctrl_type =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2; =20 - if (!(controller =3D virDomainControllerDefNew(VIR_DOMAIN_CONT= ROLLER_TYPE_USB))) - return -1; - + controller =3D virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER= _TYPE_USB); controller->type =3D VIR_DOMAIN_CONTROLLER_TYPE_USB; controller->model =3D usbctrl_type; controller->opts.usbopts.ports =3D usbctrl_ports; --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 173933494566128.964917318499715; Tue, 11 Feb 2025 20:35:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 16605150D; Tue, 11 Feb 2025 23:35:15 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 97BDB166B; Tue, 11 Feb 2025 23:29:55 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 61F761580; Tue, 11 Feb 2025 23:29:45 -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 2D7411661 for ; Tue, 11 Feb 2025 23:29:24 -0500 (EST) Received: from mx-prod-mc-05.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-369-tSJc6RTAPk6FtbnqRLBcoQ-1; Tue, 11 Feb 2025 23:29:19 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63E521956086 for ; Wed, 12 Feb 2025 04:29:18 +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 EABD8180087B for ; Wed, 12 Feb 2025 04:29:17 +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=1739334563; 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=4MrW+8cW8085x8WOa8fh+GEJgdMn2fY67+4LUkEVYIo=; b=Lc1RNZ4pVxqrlU3ZwoCeiQfjvJuIKEAHTwiAjrWG3OAj3JZithENMAoibUX1LoXoQwFM1h A8tWxiCvYNjLmpo2neLPEOpau104nOqtomboeYwUbvlVZ33W2i4WU0zrQn6GnR4h71Txkp HQL1WqbKdFqyNS0sLOIxG0stOfEANO8= X-MC-Unique: tSJc6RTAPk6FtbnqRLBcoQ-1 X-Mimecast-MFC-AGG-ID: tSJc6RTAPk6FtbnqRLBcoQ From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 09/17] conf: stop checking for NULL return from virDomainDefAddController() Date: Tue, 11 Feb 2025 23:29:02 -0500 Message-ID: <20250212042910.548504-10-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: ZuOSaK2e9e5zlyPUA5UFVxoYW08QEmu4eDK-BngKT9A_1739334558 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UMJRZDXDXL5ZQWE6V4ZGR5L2PU3W223G X-Message-ID-Hash: UMJRZDXDXL5ZQWE6V4ZGR5L2PU3W223G 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: 1739334946468019000 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail, so the caller doesn't need to check the return. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 25 +++++++++---------------- src/libxl/libxl_domain.c | 3 +-- src/qemu/qemu_postparse.c | 12 ++++++------ src/vbox/vbox_common.c | 13 ++----------- src/vmx/vmx.c | 12 ++++-------- 5 files changed, 22 insertions(+), 43 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ce7501f2b3..837b306919 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16490,10 +16490,7 @@ virDomainDefAddUSBController(virDomainDef *def, in= t idx, int model) { virDomainControllerDef *cont; /* this is a *copy* of the virDomainCont= rollerDef */ =20 - cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, - idx, model); - if (!cont) - return -1; + cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB= , idx, model); =20 if (model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1) return 0; @@ -16504,21 +16501,18 @@ virDomainDefAddUSBController(virDomainDef *def, i= nt idx, int model) =20 idx =3D cont->idx; /* in case original request was "-1" */ =20 - if (!(cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TY= PE_USB, - idx, VIR_DOMAIN_CONTROLLER_MODE= L_USB_ICH9_UHCI1))) - return -1; + cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, + idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_= ICH9_UHCI1); cont->info.mastertype =3D VIR_DOMAIN_CONTROLLER_MASTER_USB; cont->info.master.usb.startport =3D 0; =20 - if (!(cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TY= PE_USB, - idx, VIR_DOMAIN_CONTROLLER_MODE= L_USB_ICH9_UHCI2))) - return -1; + cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, + idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_= ICH9_UHCI2); cont->info.mastertype =3D VIR_DOMAIN_CONTROLLER_MASTER_USB; cont->info.master.usb.startport =3D 2; =20 - if (!(cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TY= PE_USB, - idx, VIR_DOMAIN_CONTROLLER_MODE= L_USB_ICH9_UHCI3))) - return -1; + cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, + idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_= ICH9_UHCI3); cont->info.mastertype =3D VIR_DOMAIN_CONTROLLER_MASTER_USB; cont->info.master.usb.startport =3D 4; =20 @@ -16538,9 +16532,8 @@ virDomainDefMaybeAddController(virDomainDef *def, if (idx >=3D 0 && virDomainControllerFind(def, type, idx) >=3D 0) return 0; =20 - if (virDomainDefAddController(def, type, idx, model)) - return 1; - return -1; + virDomainDefAddController(def, type, idx, model); + return 1; } =20 =20 diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index c7ba5636c4..596503c09f 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -291,8 +291,7 @@ libxlDomainDefPostParse(virDomainDef *def, =20 /* add implicit xenbus device */ if (virDomainControllerFindByType(def, VIR_DOMAIN_CONTROLLER_TYPE_XENB= US) =3D=3D -1) - if (virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_XENB= US, -1, -1) =3D=3D NULL) - return -1; + virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS, = -1, -1); =20 return 0; } diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 0de48916f4..71d772bfa0 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1354,9 +1354,9 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, virDomainControllerModelPCITypeToString(def= ->controllers[pciRoot]->model)); return -1; } - } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_T= YPE_PCI, 0, - VIR_DOMAIN_CONTROLLER_MODEL_= PCI_ROOT)) { - return -1; + } else { + virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI,= 0, + VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT= ); } } =20 @@ -1375,9 +1375,9 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, virDomainControllerModelPCITypeToString(def= ->controllers[pciRoot]->model)); return -1; } - } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_T= YPE_PCI, 0, - VIR_DOMAIN_CONTROLLER_MODEL_P= CIE_ROOT)) { - return -1; + } else { + virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI,= 0, + VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROO= T); } } =20 diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..4387d706d6 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3230,17 +3230,8 @@ vboxDumpStorageControllers(virDomainDef *def, IMachi= ne *machine) goto cleanup; } =20 - if (type !=3D VIR_DOMAIN_CONTROLLER_TYPE_LAST) { - virDomainControllerDef *cont; - - cont =3D virDomainDefAddController(def, type, -1, model); - if (!cont) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to add %1$s controller type defin= ition"), - virDomainControllerTypeToString(type)); - goto cleanup; - } - } + if (type !=3D VIR_DOMAIN_CONTROLLER_TYPE_LAST) + virDomainDefAddController(def, type, -1, model); } =20 ret =3D 0; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 23a8a35360..8d10b6e9e8 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1756,9 +1756,8 @@ virVMXParseConfig(virVMXContext *ctx, if (def->ndisks !=3D 0) { virDomainDeviceInfo *info =3D &def->disks[def->ndisks - 1]->info; for (controller =3D 0; controller <=3D info->addr.drive.controller= ; controller++) { - if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _SCSI, - controller, scsi_virtualDev[con= troller])) - goto cleanup; + virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, + controller, scsi_virtualDev[controll= er]); } saved_ndisks =3D def->ndisks; } @@ -1799,11 +1798,8 @@ virVMXParseConfig(virVMXContext *ctx, * currently used by a disk */ if (def->ndisks - saved_ndisks !=3D 0) { virDomainDeviceInfo *info =3D &def->disks[def->ndisks - 1]->info; - for (controller =3D 0; controller <=3D info->addr.drive.controller= ; controller++) { - if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _SATA, - controller, -1)) - goto cleanup; - } + for (controller =3D 0; controller <=3D info->addr.drive.controller= ; controller++) + virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA= , controller, -1); } =20 /* def:disks (ide) */ --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334807535947.3797242266155; Tue, 11 Feb 2025 20:33:27 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DE1DC1669; Tue, 11 Feb 2025 23:33:26 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D021516F6; Tue, 11 Feb 2025 23:29:44 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 136E51634; Tue, 11 Feb 2025 23:29:40 -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 33CC81634 for ; Tue, 11 Feb 2025 23:29:23 -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-371-EPk4BtUuO8K2j2HWWCgxpw-1; Tue, 11 Feb 2025 23:29:20 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1A8FF1800877 for ; Wed, 12 Feb 2025 04:29:19 +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 A1A911800570 for ; Wed, 12 Feb 2025 04:29:18 +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=1739334561; 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=Mz5xGxMKaVP88fAIGwAj86edG7iSxZoiKM+Jm3juEgE=; b=UmXiEBCZF+eWrEiWp95qGyq9hV+hkYD3DohllA0mQZr5tXPyyKuznmgk+Nfc9wjDs+/rDr by4HFp7AHMns/79ldEI4Ze2LUN14TPR4pQO6+YF7TS/OFP1gvODZKbJfDLMK01F8yo5PBu 2qykcHjpaM0o5Xn47XYz2dsObpwVDt8= X-MC-Unique: EPk4BtUuO8K2j2HWWCgxpw-1 X-Mimecast-MFC-AGG-ID: EPk4BtUuO8K2j2HWWCgxpw From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 10/17] conf: change virDomainDefAddUSBController() to return void Date: Tue, 11 Feb 2025 23:29:03 -0500 Message-ID: <20250212042910.548504-11-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: mFYA9QOVanDS3ElqJXZkxMn676dW56IMAwUfmL7nVQg_1739334559 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2COHK5E6LMOMEZPPZZ6A3MWCX46WFB6X X-Message-ID-Hash: 2COHK5E6LMOMEZPPZZ6A3MWCX46WFB6X 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: 1739334807916019000 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 | 8 +++----- src/conf/domain_conf.h | 2 +- src/qemu/qemu_postparse.c | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 837b306919..5d887054af 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16483,9 +16483,9 @@ virDomainDefAddController(virDomainDef *def, * also add companion uhci1, uhci2, and uhci3 controllers at the same * index. * - * Returns 0 on success, -1 on failure. + * Always succeeds. */ -int +void virDomainDefAddUSBController(virDomainDef *def, int idx, int model) { virDomainControllerDef *cont; /* this is a *copy* of the virDomainCont= rollerDef */ @@ -16493,7 +16493,7 @@ virDomainDefAddUSBController(virDomainDef *def, int= idx, int model) cont =3D virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB= , idx, model); =20 if (model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1) - return 0; + return; =20 /* When the initial controller is ich9-usb-ehci, also add the * companion controllers @@ -16515,8 +16515,6 @@ virDomainDefAddUSBController(virDomainDef *def, int= idx, int model) idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_= ICH9_UHCI3); cont->info.mastertype =3D VIR_DOMAIN_CONTROLLER_MASTER_USB; cont->info.master.usb.startport =3D 4; - - return 0; } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1edc3679cd..87774b7dbc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4363,7 +4363,7 @@ virDomainDefAddController(virDomainDef *def, virDomainControllerType type, int idx, int model); -int +void virDomainDefAddUSBController(virDomainDef *def, int idx, int model); int virDomainDefMaybeAddController(virDomainDef *def, diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 71d772bfa0..0eb6a81f94 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1331,10 +1331,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, break; } =20 - if (addDefaultUSB && - virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < = 0 && - virDomainDefAddUSBController(def, 0, usbModel) < 0) - return -1; + if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLE= R_TYPE_USB, 0) < 0) + virDomainDefAddUSBController(def, 0, usbModel); =20 if (addImplicitSATA && virDomainDefMaybeAddController( --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 17393348531483.3266451636776537; Tue, 11 Feb 2025 20:34:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 201401478; Tue, 11 Feb 2025 23:34:12 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3D009172F; Tue, 11 Feb 2025 23:29:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 040EF1493; 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 4959E1493 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-37-wCVrpszONJCQjxmqezE1NQ-1; Tue, 11 Feb 2025 23:29:21 -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 C6F4419560AA for ; Wed, 12 Feb 2025 04:29:19 +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 59763180087B for ; Wed, 12 Feb 2025 04:29:19 +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=1739334563; 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=y4yOf2LIjmyfqha+f9CrM6LHYv7Xrm+NR5Fvc9HQ/NI=; b=TW+4zH5w8q5FeYOT9LX6idyzYIu1GBJNALiSfGBPHojiUbmrk2XQnoTrGfywFTBdwh5zAi WSD5yXz4wuPNXm0v39GLtb3NIQOyAPK1xLWj4hNnb89h/CIBfiWTHk2ZcEd45Dob76EwsA qeMsdCXLTd6NhNSlQLHRplpBW0GOW+w= X-MC-Unique: wCVrpszONJCQjxmqezE1NQ-1 X-Mimecast-MFC-AGG-ID: wCVrpszONJCQjxmqezE1NQ_1739334559 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 11/17] hyperv: change hypervDomainDefAppendController() to return void Date: Tue, 11 Feb 2025 23:29:04 -0500 Message-ID: <20250212042910.548504-12-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: T5Qf4SzkP6pbb3KOVLppbRU59I_Xvdg1Owfw7lYRg9E_1739334559 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VQFWWHK5FLXPZCNBRXHI2GYWKMDJ7ATD X-Message-ID-Hash: VQFWWHK5FLXPZCNBRXHI2GYWKMDJ7ATD 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: 1739334855691019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. And as a result, hypervDomainDefAppendSCSIController() and hypervDomainDefAppendIDEController() can also be changed to return void. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/hyperv/hyperv_driver.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 66286cc756..0d1e388c08 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1169,7 +1169,7 @@ hypervDomainAttachSyntheticEthernetAdapter(virDomainP= tr domain, /* * Functions for deserializing device entries */ -static int +static void hypervDomainDefAppendController(virDomainDef *def, int idx, virDomainControllerType controllerType) @@ -1178,22 +1178,20 @@ hypervDomainDefAppendController(virDomainDef *def, =20 controller->idx =3D idx; VIR_APPEND_ELEMENT(def->controllers, def->ncontrollers, controller); - - return 0; } =20 =20 -static int +static void hypervDomainDefAppendIDEController(virDomainDef *def) { - return hypervDomainDefAppendController(def, 0, VIR_DOMAIN_CONTROLLER_T= YPE_IDE); + hypervDomainDefAppendController(def, 0, VIR_DOMAIN_CONTROLLER_TYPE_IDE= ); } =20 =20 -static int +static void hypervDomainDefAppendSCSIController(virDomainDef *def, int idx) { - return hypervDomainDefAppendController(def, idx, VIR_DOMAIN_CONTROLLER= _TYPE_SCSI); + hypervDomainDefAppendController(def, idx, VIR_DOMAIN_CONTROLLER_TYPE_S= CSI); } =20 =20 @@ -1460,18 +1458,12 @@ hypervDomainDefParseStorage(hypervPrivate *priv, ideChannels[channel] =3D entry; if (!hasIdeController) { /* Hyper-V represents its PIIX4 controller's two channels = as separate objects. */ - if (hypervDomainDefAppendIDEController(def) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could = not add IDE controller")); - return -1; - } + hypervDomainDefAppendIDEController(def); hasIdeController =3D true; } } else if (entry->data->ResourceType =3D=3D MSVM_RASD_RESOURCETYPE= _PARALLEL_SCSI_HBA) { scsiControllers[scsi_idx++] =3D entry; - if (hypervDomainDefAppendSCSIController(def, scsi_idx - 1) < 0= ) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not = parse SCSI controller")); - return -1; - } + hypervDomainDefAppendSCSIController(def, scsi_idx - 1); } =20 entry =3D entry->next; --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334833947463.91518262982026; Tue, 11 Feb 2025 20:33:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3DA761612; Tue, 11 Feb 2025 23:33:53 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5115F1708; Tue, 11 Feb 2025 23:29:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id EDF2A1480; Tue, 11 Feb 2025 23:29:40 -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 8D6801644 for ; Tue, 11 Feb 2025 23:29:23 -0500 (EST) 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-85-h8FOPT3eO5CqUzuaZx4h7A-1; Tue, 11 Feb 2025 23:29:21 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7D1341956086 for ; Wed, 12 Feb 2025 04:29:20 +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 1030B1800570 for ; Wed, 12 Feb 2025 04:29:19 +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=1739334563; 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=RxDn3eZ4opL2/0Fw7Fr+kxSwGYrc2OhZNicXexc+Bns=; b=WKwt068Ahjs2h6u/47K3t6sIH2A1WoahUixX0CoG+YMr2oJkAUk4RymXub4YaLOEjMGzmu o8EB2Cd2G/KjpwLXEcQGwO+NJOf+5vMXrO3C/AAzLerdee12zv+cW1v4qBdjMoIMIbHe55 yUcAWw5VA6N9Vy6zZ9p9Ywy6E5U2StQ= X-MC-Unique: h8FOPT3eO5CqUzuaZx4h7A-1 X-Mimecast-MFC-AGG-ID: h8FOPT3eO5CqUzuaZx4h7A_1739334560 From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 12/17] conf: change virDomainDefMaybeAddController() to return true/false Date: Tue, 11 Feb 2025 23:29:05 -0500 Message-ID: <20250212042910.548504-13-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: 2YDTiZHCBMbv5P9B-n_qFsF9Uodq8jPoe17gvCosGb8_1739334560 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SMMR4VCJ7GYL5XJ4X26DPDHDDMUI33GY X-Message-ID-Hash: SMMR4VCJ7GYL5XJ4X26DPDHDDMUI33GY 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: 1739334836023019000 Content-Type: text/plain; charset="utf-8"; x-default="true" This function can't fail, but it has always returned 1 if a controller is added and 0 if not, and there is one place that checks for a 1 return, so we remove the -1 return and change it to return true/false instead of 1/0. Signed-off-by: Laine Stump --- src/bhyve/bhyve_domain.c | 13 ++++++------- src/conf/domain_addr.c | 6 +----- src/conf/domain_conf.c | 34 ++++++++++------------------------ src/conf/domain_conf.h | 2 +- src/qemu/qemu_domain_address.c | 8 +------- src/qemu/qemu_postparse.c | 6 ++---- 6 files changed, 21 insertions(+), 48 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 684d870749..7d1ea7f1b1 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -94,14 +94,13 @@ bhyveDomainDefPostParse(virDomainDef *def, return -1; =20 /* Add an implicit PCI root controller */ - if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI= , 0, - VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROO= T) < 0) - return -1; + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, + VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT); =20 - if (bhyveDomainDefNeedsISAController(def)) - if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _ISA, 0, - VIR_DOMAIN_CONTROLLER_MODEL_ISA= _DEFAULT) < 0) - return -1; + if (bhyveDomainDefNeedsISAController(def)) { + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_ISA= , 0, + VIR_DOMAIN_CONTROLLER_MODEL_ISA_DEF= AULT); + } =20 return 0; } diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index a53ff6df6c..8dfa8feca0 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1625,11 +1625,7 @@ virDomainVirtioSerialAddrSetAutoaddController(virDom= ainDef *def, { int contidx; =20 - if (virDomainDefMaybeAddController(def, - VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_S= ERIAL, - idx, -1) < 0) - return -1; - + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_= SERIAL, idx, -1); contidx =3D virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_VI= RTIO_SERIAL, idx); =20 if (virDomainVirtioSerialAddrSetAddController(addrs, def->controllers[= contidx]) < 0) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5d887054af..611b6a44c8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16518,7 +16518,7 @@ virDomainDefAddUSBController(virDomainDef *def, int= idx, int model) } =20 =20 -int +bool virDomainDefMaybeAddController(virDomainDef *def, virDomainControllerType type, int idx, @@ -16528,10 +16528,10 @@ virDomainDefMaybeAddController(virDomainDef *def, * in use for that type of controller */ if (idx >=3D 0 && virDomainControllerFind(def, type, idx) >=3D 0) - return 0; + return false; =20 virDomainDefAddController(def, type, idx, model); - return 1; + return true; } =20 =20 @@ -17229,11 +17229,8 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDomai= nDef *def) if (maxController =3D=3D -1) return 0; =20 - for (i =3D 0; i <=3D maxController; i++) { - if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _SCSI, - i, newModel) < 0) - return -1; - } + for (i =3D 0; i <=3D maxController; i++) + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCS= I, i, newModel); =20 return 0; } @@ -22271,10 +22268,8 @@ virDomainDefAddDiskControllersForType(virDomainDef= *def, if (maxController =3D=3D -1) return 0; =20 - for (i =3D 0; i <=3D maxController; i++) { - if (virDomainDefMaybeAddController(def, controllerType, i, -1) < 0) - return -1; - } + for (i =3D 0; i <=3D maxController; i++) + virDomainDefMaybeAddController(def, controllerType, i, -1); =20 return 0; } @@ -22294,10 +22289,7 @@ virDomainDefMaybeAddVirtioSerialController(virDoma= inDef *def) if (channel->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_V= IRTIO_SERIAL) idx =3D channel->info.addr.vioserial.controller; =20 - if (virDomainDefMaybeAddController(def, - VIR_DOMAIN_CONTROLLER_TYPE_= VIRTIO_SERIAL, - idx, -1) < 0) - return -1; + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _VIRTIO_SERIAL, idx, -1); } } =20 @@ -22309,10 +22301,7 @@ virDomainDefMaybeAddVirtioSerialController(virDoma= inDef *def) if (console->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_V= IRTIO_SERIAL) idx =3D console->info.addr.vioserial.controller; =20 - if (virDomainDefMaybeAddController(def, - VIR_DOMAIN_CONTROLLER_TYPE_= VIRTIO_SERIAL, - idx, -1) < 0) - return -1; + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _VIRTIO_SERIAL, idx, -1); } } =20 @@ -22349,10 +22338,7 @@ virDomainDefMaybeAddSmartcardController(virDomainD= ef *def) smartcard->info.addr.ccid.slot =3D max + 1; } =20 - if (virDomainDefMaybeAddController(def, - VIR_DOMAIN_CONTROLLER_TYPE_CCID, - idx, -1) < 0) - return -1; + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_CCI= D, idx, -1); } =20 return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 87774b7dbc..78a9ae5749 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4365,7 +4365,7 @@ virDomainDefAddController(virDomainDef *def, int model); void virDomainDefAddUSBController(virDomainDef *def, int idx, int model); -int +bool virDomainDefMaybeAddController(virDomainDef *def, virDomainControllerType type, int idx, diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 970ae3949d..d38983bf63 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2620,7 +2620,6 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, int max_idx =3D -1; int nbuses =3D 0; size_t i; - int rv; =20 for (i =3D 0; i < def->ncontrollers; i++) { virDomainControllerDef *cont =3D def->controllers[i]; @@ -2737,12 +2736,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, int contIndex; virDomainPCIAddressBus *bus =3D &addrs->buses[i]; =20 - if ((rv =3D virDomainDefMaybeAddController( - def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, - i, bus->model)) < 0) - goto cleanup; - - if (rv =3D=3D 0) + if (!virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER= _TYPE_PCI, i, bus->model)) continue; /* no new controller added */ =20 /* We did add a new controller, so we will need one more diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 0eb6a81f94..fc7918d9c4 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1334,10 +1334,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLE= R_TYPE_USB, 0) < 0) virDomainDefAddUSBController(def, 0, usbModel); =20 - if (addImplicitSATA && - virDomainDefMaybeAddController( - def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0) - return -1; + if (addImplicitSATA) + virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SAT= A, 0, -1); =20 pciRoot =3D virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PC= I, 0); =20 --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 From nobody Fri Dec 19 00:03:54 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 1739334891882389.82367339898883; Tue, 11 Feb 2025 20:34:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 446F717F5; Tue, 11 Feb 2025 23:34:51 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9C3BD1773; Tue, 11 Feb 2025 23:29:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0F67015CC; Tue, 11 Feb 2025 23:29:44 -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 BDBA5149C for ; Tue, 11 Feb 2025 23:29:24 -0500 (EST) 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-647-wEw4CRttP1uNn8HJ3wbtxw-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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B2DC1956094 for ; Wed, 12 Feb 2025 04:29:22 +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 736FB18008D8 for ; Wed, 12 Feb 2025 04:29:21 +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=oapxCjuSyLrzDdQDoiygbBu0TTLdy9PfKksLLBqmT6Y=; b=STZeHXnCKOwVjBl6GjYU8Rcsyh0mqDW6G+mzidlSu85O+KME1Sj/xzncHW6m5ts+HqCGF+ FMBm3vYellrPam6WSXjHD+40LJxfH8tY6emMmdqEoG29+YCvffQFu05ZYud413Hlwe1E4m WdsM/SqAHqB4nFk2Xfa642aMwbkAdvA= X-MC-Unique: wEw4CRttP1uNn8HJ3wbtxw-1 X-Mimecast-MFC-AGG-ID: wEw4CRttP1uNn8HJ3wbtxw From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 14/17] conf: change virDomainDefAddDiskControllersForType() to return void Date: Tue, 11 Feb 2025 23:29:07 -0500 Message-ID: <20250212042910.548504-15-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: aOWJxObKS4wijrv53bd7KPOdkdvDkDBRSKkXWqV7orc_1739334562 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4U45Q2KQE65NQD6RTUCGBSSUJBMD2HLU X-Message-ID-Hash: 4U45Q2KQE65NQD6RTUCGBSSUJBMD2HLU 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: 1739334892313019000 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d3e95a2f92..c056abb28f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22243,7 +22243,7 @@ virDomainDefCheckABIStability(virDomainDef *src, } =20 =20 -static int +static void virDomainDefAddDiskControllersForType(virDomainDef *def, virDomainControllerType controllerTy= pe, int diskBus) @@ -22263,12 +22263,10 @@ virDomainDefAddDiskControllersForType(virDomainDe= f *def, } =20 if (maxController =3D=3D -1) - return 0; + return; =20 for (i =3D 0; i <=3D maxController; i++) virDomainDefMaybeAddController(def, controllerType, i, -1); - - return 0; } =20 =20 @@ -22350,25 +22348,14 @@ virDomainDefMaybeAddSmartcardController(virDomain= Def *def) static int virDomainDefAddImplicitControllers(virDomainDef *def) { - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_S= CSI, - VIR_DOMAIN_DISK_BUS_SCSI) < = 0) - return -1; - - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_F= DC, - VIR_DOMAIN_DISK_BUS_FDC) < 0) - return -1; - - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_I= DE, - VIR_DOMAIN_DISK_BUS_IDE) < 0) - return -1; - - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_S= ATA, - VIR_DOMAIN_DISK_BUS_SATA) < = 0) - return -1; + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_= SCSI, + VIR_DOMAIN_DISK_BUS_SCSI); + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_= FDC, + VIR_DOMAIN_DISK_BUS_FDC); + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_= IDE, + VIR_DOMAIN_DISK_BUS_IDE); + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_= SATA, + VIR_DOMAIN_DISK_BUS_SATA); =20 if (virDomainDefMaybeAddVirtioSerialController(def) < 0) return -1; --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 1739334940471757.8707251517818; Tue, 11 Feb 2025 20:35:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 79D8D15F5; Tue, 11 Feb 2025 23:35:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 19A8E149C; Tue, 11 Feb 2025 23:29:59 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DF02F15FF; Tue, 11 Feb 2025 23:29:53 -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 45A451301 for ; Tue, 11 Feb 2025 23:29:25 -0500 (EST) Received: from mx-prod-mc-04.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-611-o7porxKtML2-nzbbgWgJXA-1; Tue, 11 Feb 2025 23:29:23 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A9BA11955DD0 for ; Wed, 12 Feb 2025 04:29:22 +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 34FFC1800570 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_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=1739334565; 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=nM4G9e0Zy7gK3ydQ33gFc/psm7huVQJyOin8zR2nlTA=; b=frYU7M+rkd8TioQZxgS+jE3fv8cKjlqn6Kb1U5gKIGooIYKNONGE//XvzDmYVdxQK1ukY9 eseF2OwFXDLoztJ9p6rmExK4Je+QvvGrJuWVJgIKtg0omd5SPB18TL3HJWEJo9IxlUkGvt FE6w/+vhXpHGbtz6X+dHzwmHEKk8kuk= X-MC-Unique: o7porxKtML2-nzbbgWgJXA-1 X-Mimecast-MFC-AGG-ID: o7porxKtML2-nzbbgWgJXA From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 15/17] conf: change virDomainDefMaybeAddVirtioSerialController() to return void Date: Tue, 11 Feb 2025 23:29:08 -0500 Message-ID: <20250212042910.548504-16-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: C8FtMRJ436cp29JFQjjqbwDrjAZ2V7pIRiMdHY5Z448_1739334562 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EI6Z3J337BTPBIXGH3WWIT6PLCK3G7FZ X-Message-ID-Hash: EI6Z3J337BTPBIXGH3WWIT6PLCK3G7FZ 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: 1739334941881019100 Content-Type: text/plain; charset="utf-8"; x-default="true" It can't fail. Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c056abb28f..fe816dfd6d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22270,7 +22270,7 @@ virDomainDefAddDiskControllersForType(virDomainDef = *def, } =20 =20 -static int +static void virDomainDefMaybeAddVirtioSerialController(virDomainDef *def) { /* Look for any virtio serial or virtio console devs */ @@ -22299,8 +22299,6 @@ virDomainDefMaybeAddVirtioSerialController(virDomai= nDef *def) virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _VIRTIO_SERIAL, idx, -1); } } - - return 0; } =20 =20 @@ -22357,8 +22355,7 @@ virDomainDefAddImplicitControllers(virDomainDef *de= f) virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_= SATA, VIR_DOMAIN_DISK_BUS_SATA); =20 - if (virDomainDefMaybeAddVirtioSerialController(def) < 0) - return -1; + virDomainDefMaybeAddVirtioSerialController(def); =20 if (virDomainDefMaybeAddSmartcardController(def) < 0) return -1; --=20 2.47.1 From nobody Fri Dec 19 00:03:54 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 From nobody Fri Dec 19 00:03:54 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 1739334974611772.0014455067567; Tue, 11 Feb 2025 20:36:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9833212AF; Tue, 11 Feb 2025 23:36:13 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1148717B0; Tue, 11 Feb 2025 23:30:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7FD891471; Tue, 11 Feb 2025 23:29:57 -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 C318E1471 for ; Tue, 11 Feb 2025 23:29:26 -0500 (EST) Received: from mx-prod-mc-01.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-632-1RdQI5lJOd2bY-xzvP8log-1; Tue, 11 Feb 2025 23:29:25 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 23D76195608C for ; Wed, 12 Feb 2025 04:29:24 +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 AB91A1800570 for ; Wed, 12 Feb 2025 04:29:23 +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=jyYCdDJ+ZVB5/gAT99Ry2z5keh2ciSS2OsYDJ7KA5xA=; b=MrblF2WNYtdq6BEU+MTCgQOwWWeyb6R1e2K/kDz6stUensdPB22wxf+CeJaUJlWJVszfrH NNkRUIT3fgFv+bWccfcDYPQm6tRhUCh8sBEKIbllscJx95jkuRfWCBm8gvNzYP0Y78QfbB kuuj0KmRAOkBTsF6rt8HDmrD3WYrwF0= X-MC-Unique: 1RdQI5lJOd2bY-xzvP8log-1 X-Mimecast-MFC-AGG-ID: 1RdQI5lJOd2bY-xzvP8log From: Laine Stump To: devel@lists.libvirt.org Subject: [PATCH 17/17] conf: change virDomainDefAddImplicitControllers() to return void Date: Tue, 11 Feb 2025 23:29:10 -0500 Message-ID: <20250212042910.548504-18-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: Flrz9f0CqJr3A4trpCm7y7BED80d1iqnzDJGBOqsHUs_1739334564 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: C3DXJNNBETU46WQVP6EFYJWHPD33ANXE X-Message-ID-Hash: C3DXJNNBETU46WQVP6EFYJWHPD33ANXE 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: 1739334976025019100 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 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c4bdf58788..21fe1502db 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22341,7 +22341,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDe= f *def) * in the XML. This is for compat with existing apps which will * not know/care about info in the XML */ -static int +static void virDomainDefAddImplicitControllers(virDomainDef *def) { virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_= SCSI, @@ -22356,8 +22356,6 @@ virDomainDefAddImplicitControllers(virDomainDef *de= f) virDomainDefMaybeAddVirtioSerialController(def); virDomainDefMaybeAddSmartcardController(def); virDomainDefMaybeAddHostdevSCSIcontroller(def); - - return 0; } =20 static int @@ -22384,8 +22382,7 @@ virDomainDefAddImplicitDevices(virDomainDef *def, v= irDomainXMLOption *xmlopt) if (virDomainDefAddConsoleCompat(def) < 0) return -1; } - if (virDomainDefAddImplicitControllers(def) < 0) - return -1; + virDomainDefAddImplicitControllers(def); =20 if (virDomainDefAddImplicitVideo(def, xmlopt) < 0) return -1; --=20 2.47.1