Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90093CD98D2 for ; Thu, 11 Jun 2026 09:44:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXbxb-00040n-SH; Thu, 11 Jun 2026 05:44:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbxa-00040e-L7 for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:44:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbxX-0001QK-By for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:44:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781171061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6h3R5tmhBmpmEEYG/+CaWjmY8zl0N+ed0tPUFPcH07M=; b=NINNbuZ+5dq0qUTDQ2ZkUbWbyNuUDLObanJNqhX9yjmZ99bh6avVu/ezumsXeJK8Tm2Oh6 8OvpxX7P5ENOmnWck/PSRQgsIc5me2INa3lQ5SzFdgV4DvDu2dLDvIO5n+u7MX2Bwb7TQx hQVjLH0dislx6jXH0EjaWIOWsTuMb2g= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-TXmuLC6SNsyLFWMPVuM7uA-1; Thu, 11 Jun 2026 05:44:20 -0400 X-MC-Unique: TXmuLC6SNsyLFWMPVuM7uA-1 X-Mimecast-MFC-AGG-ID: TXmuLC6SNsyLFWMPVuM7uA_1781171059 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 081C918005AB; Thu, 11 Jun 2026 09:44:19 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.32.227]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B2C611774; Thu, 11 Jun 2026 09:44:16 +0000 (UTC) From: Mario Casquero To: qemu-devel@nongnu.org Cc: clg@redhat.com, alex@shazbot.org, philmd@mailo.com, Mario Casquero Subject: [PATCH] vfio/pci: Propagate errors in vfio_pci_load_rom() using Error API Date: Thu, 11 Jun 2026 11:43:48 +0200 Message-ID: <20260611094348.516879-1-mcasquer@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass client-ip=170.10.129.124; envelope-from=mcasquer@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Updates vfio_pci_load_rom() to use Error API for error propagation instead of error_report(), improving error handling consistency. Signed-off-by: Mario Casquero --- hw/vfio/pci.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 9df04fa2d7..11876fd5b4 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1027,7 +1027,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev) } } -static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) +static bool vfio_pci_load_rom(VFIOPCIDevice *vdev, Error **errp) { VFIODevice *vbasedev = &vdev->vbasedev; struct vfio_region_info *reg_info = NULL; @@ -1040,7 +1040,7 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) ®_info); if (ret != 0) { - error_report("vfio: Error getting ROM info: %s", strerror(-ret)); + error_setg_errno(errp, -ret, "vfio: Error getting ROM info"); return false; } @@ -1052,10 +1052,10 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) vdev->rom_offset = reg_info->offset; if (!vdev->rom_size) { - error_report("vfio-pci: Cannot read device rom at %s", vbasedev->name); - error_printf("Device option ROM contents are probably invalid " - "(check dmesg).\nSkip option ROM probe with rombar=0, " - "or load from file with romfile=\n"); + error_setg(errp, "vfio-pci: Cannot read device rom at %s. " + "Device option ROM contents are probably invalid " + "(check dmesg). Skip option ROM probe with rombar=0, " + "or load from file with romfile=", vbasedev->name); return false; } @@ -1076,9 +1076,8 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) if (bytes == -EINTR || bytes == -EAGAIN) { continue; } - error_report("vfio: Error reading device ROM: %s", - strreaderror(bytes)); - + error_setg(errp, "vfio: Error reading device ROM: %s", + strreaderror(bytes)); break; } } @@ -1147,7 +1146,7 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size) /* Load the ROM lazily when the guest tries to read it */ if (unlikely(!vdev->rom && !vdev->rom_read_failed)) { - vdev->rom_read_failed = !vfio_pci_load_rom(vdev); + vdev->rom_read_failed = !vfio_pci_load_rom(vdev, NULL); } memcpy(&val, vdev->rom + addr, -- 2.54.0