From nobody Mon Sep 16 19:11:49 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 1706126728247218.34974468044652; Wed, 24 Jan 2024 12:05:28 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 02BAE1B88; Wed, 24 Jan 2024 15:05:27 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 71F511A14; Wed, 24 Jan 2024 14:40:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9FC6518F2; 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 A03E518FE for ; Wed, 24 Jan 2024 14:38:08 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-130-W_q6_CYSNdGY176wD9Atyg-1; Wed, 24 Jan 2024 14:38:06 -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 20B283C02B82 for ; Wed, 24 Jan 2024 19:38:06 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A2614492BC6 for ; Wed, 24 Jan 2024 19:38:05 +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: W_q6_CYSNdGY176wD9Atyg-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 13/33] qemu: Drop qemuDomainSetSCSIControllerModel() Date: Wed, 24 Jan 2024 20:37:33 +0100 Message-ID: <20240124193753.1265454-14-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: E2DL6UW2PMBAMKH6ZHCP6BVB5S6PHLLU X-Message-ID-Hash: E2DL6UW2PMBAMKH6ZHCP6BVB5S6PHLLU 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: 1706126730233100001 It only has a single caller. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 4 +++- src/qemu/qemu_domain_address.c | 25 ------------------------- src/qemu/qemu_domain_address.h | 4 ---- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9289c1fa18..48d721a809 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5584,7 +5584,9 @@ qemuDomainControllerDefPostParse(virDomainControllerD= ef *cont, switch (cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: /* Set the default SCSI controller model if not already set */ - if (qemuDomainSetSCSIControllerModel(def, cont, qemuCaps) < 0) + cont->model =3D qemuDomainGetSCSIControllerModel(def, cont, qemuCa= ps); + + if (cont->model < 0) return -1; break; =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 22af903b6a..0a7273dc07 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -74,31 +74,6 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *def, } =20 =20 -/** - * @def: Domain definition - * @cont: Domain controller def - * @qemuCaps: qemu capabilities - * - * Set the controller model based on the existing value and the - * capabilities if possible. - * - * Returns 0 on success, -1 on failure with error set. - */ -int -qemuDomainSetSCSIControllerModel(const virDomainDef *def, - virDomainControllerDef *cont, - virQEMUCaps *qemuCaps) -{ - int model =3D qemuDomainGetSCSIControllerModel(def, cont, qemuCaps); - - if (model < 0) - return -1; - - cont->model =3D model; - return 0; -} - - static int qemuDomainAssignVirtioSerialAddresses(virDomainDef *def) { diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index a571312469..0ac6285f2e 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -28,10 +28,6 @@ int qemuDomainGetSCSIControllerModel(const virDomainDef = *def, const virDomainControllerDef *cont, virQEMUCaps *qemuCaps); =20 -int qemuDomainSetSCSIControllerModel(const virDomainDef *def, - virDomainControllerDef *cont, - virQEMUCaps *qemuCaps); - 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