From nobody Fri Dec 19 07:49:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 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