From nobody Sun Dec 22 06:07: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 1706127602054398.4397183713786; Wed, 24 Jan 2024 12:20:02 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id F11CE1B98; Wed, 24 Jan 2024 15:20:00 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 66D0E19F8; Wed, 24 Jan 2024 14:41:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 510851996; Wed, 24 Jan 2024 14:38:18 -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 3B3F21903 for ; Wed, 24 Jan 2024 14:38:11 -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-22-h7NodNlOPOS-xcpfgJDI0Q-1; Wed, 24 Jan 2024 14:38:09 -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 30CCD84AEA2 for ; Wed, 24 Jan 2024 19:38:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1A65492BC6 for ; Wed, 24 Jan 2024 19:38:08 +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: h7NodNlOPOS-xcpfgJDI0Q-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 17/33] qemu: Rename qemuDomainDefaultSCSIControllerModel() Date: Wed, 24 Jan 2024 20:37:37 +0100 Message-ID: <20240124193753.1265454-18-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: FKNCYUGF7JIKZZJKUDXBD6VZAXRAAVAD X-Message-ID-Hash: FKNCYUGF7JIKZZJKUDXBD6VZAXRAAVAD 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: 1706127602803100001 The function is modified to be stateless, which is more consistent with existing helpers that deal with figuring out default models for devices, and its name needs to change accordingly. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 21 +++++++++++---------- src/qemu/qemu_domain.h | 6 +++--- src/qemu/qemu_hotplug.c | 5 +++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 672f1ce59f..97336d5002 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4106,23 +4106,23 @@ qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *= driver, =20 =20 /** + * qemuDomainDefaultSCSIControllerModel: * @def: Domain definition * @cont: Domain controller def * @qemuCaps: qemu capabilities * - * If the controller model is already defined, return it immediately; - * otherwise, based on the @qemuCaps return a default model value. + * Decides the preferred model for a SCSI controller that it to be + * added to @def. The choice might be based on various factors, + * including the architecture, machine type and what devices are + * available according to @qemuCaps. * * Returns model on success, -1 on failure with error set. */ int -qemuDomainGetSCSIControllerModel(const virDomainDef *def, - const virDomainControllerDef *cont, - virQEMUCaps *qemuCaps) +qemuDomainDefaultSCSIControllerModel(const virDomainDef *def, + const virDomainControllerDef *cont, + virQEMUCaps *qemuCaps) { - if (cont->model > 0) - return cont->model; - if (qemuDomainIsPSeries(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; if (ARCH_IS_S390(def->os.arch)) @@ -5621,9 +5621,10 @@ qemuDomainControllerDefPostParse(virDomainController= Def *cont, switch (cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: /* Set the default SCSI controller model if not already set */ - cont->model =3D qemuDomainGetSCSIControllerModel(def, cont, qemuCa= ps); + if (cont->model <=3D 0) + cont->model =3D qemuDomainDefaultSCSIControllerModel(def, cont= , qemuCaps); =20 - if (cont->model < 0) + if (cont->model <=3D 0) return -1; break; =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 4dfc0ab5c7..48f966fa2a 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -836,9 +836,9 @@ bool qemuDomainHasBuiltinESP(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def); bool qemuDomainSupportsPCI(const virDomainDef *def); bool qemuDomainSupportsPCIMultibus(const virDomainDef *def); -int qemuDomainGetSCSIControllerModel(const virDomainDef *def, - const virDomainControllerDef *cont, - virQEMUCaps *qemuCaps); +int qemuDomainDefaultSCSIControllerModel(const virDomainDef *def, + const virDomainControllerDef *con= t, + virQEMUCaps *qemuCaps); =20 void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm); =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c883fef0e9..4fd7b7f756 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -878,9 +878,10 @@ qemuDomainFindOrCreateSCSIDiskController(virDomainObj = *vm, cont->idx =3D controller; cont->model =3D model; =20 - cont->model =3D qemuDomainGetSCSIControllerModel(vm->def, cont, priv->= qemuCaps); + if (cont->model <=3D 0) + cont->model =3D qemuDomainDefaultSCSIControllerModel(vm->def, cont= , priv->qemuCaps); =20 - if (cont->model < 0) { + if (cont->model <=3D 0) { VIR_FREE(cont); return NULL; } --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org