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