From nobody Fri Dec 19 07:49:56 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