From nobody Wed Jan 15 14:58:59 2025 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 1707931160348517.6213863447251; Wed, 14 Feb 2024 09:19:20 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C1EC1C0F; Wed, 14 Feb 2024 12:19:19 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 884AA1AD6; Wed, 14 Feb 2024 12:12:13 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5B32B19F0; Wed, 14 Feb 2024 12:11:33 -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 3DA7219DC for ; Wed, 14 Feb 2024 12:11:32 -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-275-YcRrfjlnM1S_iCcUI3B96Q-1; Wed, 14 Feb 2024 12:11:29 -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 C691D85A58B for ; Wed, 14 Feb 2024 17:11:28 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CEA51121337 for ; Wed, 14 Feb 2024 17:11:28 +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_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: YcRrfjlnM1S_iCcUI3B96Q-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH v2 03/17] qemu: Move error reporting out of qemuDomainDefaultSCSIControllerModel() Date: Wed, 14 Feb 2024 18:11:10 +0100 Message-ID: <20240214171124.508000-4-abologna@redhat.com> In-Reply-To: <20240214171124.508000-1-abologna@redhat.com> References: <20240214171124.508000-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: QQP3KIQ5ZTGLKLA7H7DFVYXPPD4SFUNP X-Message-ID-Hash: QQP3KIQ5ZTGLKLA7H7DFVYXPPD4SFUNP 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: 1707931161403100001 We want this helper to work more like other similar ones, where error reporting is performed by the caller. This introduces a small amount of code duplication but makes for a cleaner API. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 9 +++++---- src/qemu/qemu_hotplug.c | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 01f4ed6917..22e6b9fd3e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4125,9 +4125,6 @@ qemuDomainDefaultSCSIControllerModel(const virDomainD= ef *def, if (qemuDomainHasBuiltinESP(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90; =20 - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to determine model for SCSI controller idx=3D= %1$d"), - cont->idx); return -1; } =20 @@ -5616,8 +5613,12 @@ qemuDomainControllerDefPostParse(virDomainController= Def *cont, /* Set the default SCSI controller model if not already set */ cont->model =3D qemuDomainDefaultSCSIControllerModel(def, cont, qe= muCaps); =20 - if (cont->model < 0) + if (cont->model < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to determine model for SCSI controlle= r idx=3D%1$d"), + cont->idx); return -1; + } break; =20 case VIR_DOMAIN_CONTROLLER_TYPE_USB: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a2498e793a..a9dbc37915 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -883,6 +883,9 @@ qemuDomainFindOrCreateSCSIDiskController(virDomainObj *= vm, cont->model =3D model; =20 if (cont->model < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to determine model for SCSI controller id= x=3D%1$d"), + cont->idx); 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