vfio/pci: Propagate errors in vfio_pci_load_rom() using Error API
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 <mcasquer@redhat.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Link: https://lore.kernel.org/qemu-devel/20260625094307.148542-1-mcasquer@redhat.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
Mario Casquero committed
Jun 25, 2026 at 11:43 UTC
802f97d22beefe360ab9f04f6b2ce93fee8ef415
1 file changed
+21
-11
hw/vfio/pci.c
+21
-11
@@ -1028,7 +1028,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev)
1028
}
1029
}
1030
1031
-static bool vfio_pci_load_rom(VFIOPCIDevice *vdev)
1031
+static bool vfio_pci_load_rom(VFIOPCIDevice *vdev, Error **errp)
1032
{
1033
VFIODevice *vbasedev = &vdev->vbasedev;
1034
struct vfio_region_info *reg_info = NULL;
@@ -1041,7 +1041,7 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev)
1041
®_info);
1042
1043
if (ret != 0) {
1044
- error_report("vfio: Error getting ROM info: %s", strerror(-ret));
1044
+ error_setg_errno(errp, -ret, "vfio: Error getting ROM info");
1045
return false;
1046
}
1047
@@ -1053,10 +1053,13 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev)
1053
vdev->rom_offset = reg_info->offset;
1054
1055
if (!vdev->rom_size) {
1056
- error_report("vfio-pci: Cannot read device rom at %s", vbasedev->name);
1057
- error_printf("Device option ROM contents are probably invalid "
1058
- "(check dmesg).\nSkip option ROM probe with rombar=0, "
1059
- "or load from file with romfile=\n");
1056
+ vdev->rom_size = 0;
1057
+ vdev->rom_offset = 0;
1058
+ error_setg(errp, "vfio-pci: Device ROM size is zero at %s",
1059
+ vbasedev->name);
1060
+ error_append_hint(errp, "Device option ROM contents are probably "
1061
+ "invalid (check dmesg).\nSkip option ROM probe "
1062
+ "with rombar=0, or load from file with romfile=\n");
1063
return false;
1064
}
1065
@@ -1077,10 +1080,12 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev)
1080
if (bytes == -EINTR || bytes == -EAGAIN) {
1081
continue;
1082
}
1080
- error_report("vfio: Error reading device ROM: %s",
1081
- strreaderror(bytes));
1082
-
1083
- break;
1083
+ error_setg_errno(errp, -bytes, "vfio: Error reading device ROM");
1084
+ g_free(vdev->rom);
1085
+ vdev->rom = NULL;
1086
+ vdev->rom_size = 0;
1087
+ vdev->rom_offset = 0;
1088
+ return false;
1089
}
1090
}
1091
@@ -1148,7 +1153,12 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)
1153
1154
/* Load the ROM lazily when the guest tries to read it */
1155
if (unlikely(!vdev->rom && !vdev->rom_read_failed)) {
1151
- vdev->rom_read_failed = !vfio_pci_load_rom(vdev);
1156
+ Error *local_err = NULL;
1157
+
1158
+ vdev->rom_read_failed = !vfio_pci_load_rom(vdev, &local_err);
1159
+ if (vdev->rom_read_failed) {
1160
+ error_report_err(local_err);
1161
+ }
1162
}
1163
1164
memcpy(&val, vdev->rom + addr,