From nobody Sun Dec 22 06:01:57 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 1706126634932152.41220029269175; Wed, 24 Jan 2024 12:03:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B7AE31A79; Wed, 24 Jan 2024 15:03:53 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3CB5B1941; Wed, 24 Jan 2024 14:40:06 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3CA7C1909; Wed, 24 Jan 2024 14:38:12 -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 28D5818DF for ; Wed, 24 Jan 2024 14:38:08 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-126-Yy2x2vkCO5OYdb0cZ97_UQ-1; Wed, 24 Jan 2024 14:38:05 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A74E84AEA0 for ; Wed, 24 Jan 2024 19:38:05 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBAF4492BC6 for ; Wed, 24 Jan 2024 19:38:04 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Yy2x2vkCO5OYdb0cZ97_UQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 12/33] qemu: Drop qemuDomainFindSCSIControllerModel() Date: Wed, 24 Jan 2024 20:37:32 +0100 Message-ID: <20240124193753.1265454-13-abologna@redhat.com> In-Reply-To: <20240124193753.1265454-1-abologna@redhat.com> References: <20240124193753.1265454-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: XNR3KE5ZFPKQTTW5X2RANDU3M5UU4GOI X-Message-ID-Hash: XNR3KE5ZFPKQTTW5X2RANDU3M5UU4GOI X-MailFrom: abologna@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706126635910100001 It only has a single caller. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_alias.c | 13 +++++++++++-- src/qemu/qemu_domain_address.c | 26 -------------------------- src/qemu/qemu_domain_address.h | 3 --- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 686b5a4d80..d2c28c182b 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -214,8 +214,17 @@ qemuAssignDeviceDiskAlias(virDomainDef *def, if (!disk->info.alias) { if (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI) { - controllerModel =3D qemuDomainFindSCSIControllerModel(def, - &disk-= >info); + virDomainControllerDef *cont; + + if (!(cont =3D virDomainDeviceFindSCSIController(def, &dis= k->info.addr.drive))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to find a SCSI controller for idx=3D= %1$d"), + disk->info.addr.drive.controller); + return -1; + } + + controllerModel =3D cont->model; + if (controllerModel < 0) return -1; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 413f152230..22af903b6a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -99,32 +99,6 @@ qemuDomainSetSCSIControllerModel(const virDomainDef *def, } =20 =20 -/** - * @def: Domain definition - * @info: Domain device info - * - * Using the device info, find the controller related to the - * device by index and use that controller to return the model. - * - * Returns the model if found, -1 if not with an error message set - */ -int -qemuDomainFindSCSIControllerModel(const virDomainDef *def, - virDomainDeviceInfo *info) -{ - virDomainControllerDef *cont; - - if (!(cont =3D virDomainDeviceFindSCSIController(def, &info->addr.driv= e))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to find a SCSI controller for idx=3D%1$d"= ), - info->addr.drive.controller); - return -1; - } - - return cont->model; -} - - static int qemuDomainAssignVirtioSerialAddresses(virDomainDef *def) { diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index dbb5de915e..a571312469 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -32,9 +32,6 @@ int qemuDomainSetSCSIControllerModel(const virDomainDef *= def, virDomainControllerDef *cont, virQEMUCaps *qemuCaps); =20 -int qemuDomainFindSCSIControllerModel(const virDomainDef *def, - virDomainDeviceInfo *info); - int qemuDomainAssignAddresses(virDomainDef *def, virQEMUCaps *qemuCaps, virQEMUDriver *driver, --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org