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