From nobody Fri Oct 18 05:24:00 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 1706634051437850.3565862694437; Tue, 30 Jan 2024 09:00:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 612FD1C8A; Tue, 30 Jan 2024 12:00:50 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 89AA41C86; Tue, 30 Jan 2024 11:58:12 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id C56781BC0; Tue, 30 Jan 2024 11:57:59 -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 C97731BB3 for ; Tue, 30 Jan 2024 11:57:58 -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-119-El5nYBVENX2vhqbLDY5piw-1; Tue, 30 Jan 2024 11:57:56 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 6F02E86F122 for ; Tue, 30 Jan 2024 16:57:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F3F891121306 for ; Tue, 30 Jan 2024 16:57:55 +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_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: El5nYBVENX2vhqbLDY5piw-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 2/3] qemu: Handle MODEL_SCSI_{AUTO,DEFAULT} appropriately Date: Tue, 30 Jan 2024 17:57:51 +0100 Message-ID: <20240130165752.1118388-3-abologna@redhat.com> In-Reply-To: <20240130165752.1118388-1-abologna@redhat.com> References: <20240130165752.1118388-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: YHA5P4YWX4I3V32GVJGB7J3STAKBBJJN X-Message-ID-Hash: YHA5P4YWX4I3V32GVJGB7J3STAKBBJJN 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: 1706634058994100001 The qemuDomainGetSCSIControllerModel() function, which is responsible for choosing a model for a SCSI controller that didn't have one provided by the user, considers values >0 to mean "model has been set". Since MODEL_SCSI_AUTO =3D=3D 0, this means that such a value is considered the same as MODEL_SCSI_DEFAULT (-1). This makes sense, as not specifying a model name or explicitly asking for one to be automatically chosen intuitively should result in the same behavior. Specifically, there is no case in which a value of MODEL_SCSI_AUTO or MODEL_SCSI_DEFAULT is encountered after the initial controller creation: it is either replaced with an actual model, or an error is raised. Despite this, there are a few places in the QEMU driver where we incorrectly treat these values as if they were actual model names. To reduce confusion, make sure that no longer happens. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain_address.c | 4 ++-- src/qemu/qemu_validate.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 31d42495f4..aa77821331 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -505,7 +505,6 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, =20 break; =20 - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: @@ -527,6 +526,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, break; =20 case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %1$d"), @@ -2685,7 +2685,6 @@ qemuBuildControllerSCSIDevProps(virDomainControllerDe= f *def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DC390: driver =3D "dc-390"; break; - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90: /* It is built-in dev = */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -2693,6 +2692,7 @@ qemuBuildControllerSCSIDevProps(virDomainControllerDe= f *def, virDomainControllerModelSCSITypeToString(def->model= )); return NULL; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %1$d"), diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 49fd4d454d..af486aea97 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -567,7 +567,6 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, =20 case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: switch ((virDomainControllerModelSCSI) cont->model) { - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90: return 0; =20 @@ -577,7 +576,6 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, =20 /* Transitional devices only work in conventional PCI slots */ case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: @@ -588,6 +586,8 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AM53C974: return pciFlags; =20 + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: return 0; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d3bea65139..73afd094a9 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3364,7 +3364,6 @@ qemuValidateCheckSCSIControllerModel(virQEMUCaps *qem= uCaps, return false; } break; - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %1$s"), @@ -3389,6 +3388,7 @@ qemuValidateCheckSCSIControllerModel(virQEMUCaps *qem= uCaps, } return true; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %1$d"), --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org