vfio/pci: Propagate errors in vfio_pci_load_rom() using Error API
PATCH v3 1/1 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.
--- hw/vfio/pci.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
hw/vfio/pci.c +16 -8
@@ -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,7 +1052,8 @@ 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_setg (errp,"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" );
@@ -1076,10 +1077,12 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev)if (bytes == -EINTR || bytes == -EAGAIN ) {continue ; } -error_report ("vfio: Error reading device ROM: %s" , -strreaderror (bytes)); - -break ; +error_setg_errno (errp, -bytes,"vfio: Error reading device ROM" ); +g_free (vdev->rom); + vdev->rom =NULL ; + vdev->rom_size =0 ; + vdev->rom_offset =0 ; +return false; } }
@@ -1147,7 +1150,12 @@ 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); +Error *local_err =NULL ; + + vdev->rom_read_failed = !vfio_pci_load_rom (vdev, &local_err); +if (vdev->rom_read_failed) { +error_report_err (local_err); + } } memcpy(&val, vdev->rom + addr,
Signature · 1 line
2.54.0
Quoted 31 lines · Mario Casquero
Updates
vfio_pci_load_rom()to use Error API for error propagation instead oferror_report(), improving error handling consistency.Signed-off-by Mario Casquero <[email protected]>--- hw/vfio/pci.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)hw/vfio/pci.c +2
-2@@ -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; }
hw/vfio/pci.c static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) · line 1056
Quoted 6 lines
hw/vfio/pci.c +2
-1@@ -1052,7 +1052,8 @@ 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_setg (errp,"vfio-pci: Cannot read device rom at %s" , + vbasedev->name);
Pre-existing but is it possible to get vfio_device_get_region_info() returning no error but the get_region_info() handler filled vfio_region_info::size as 0? I'd expect
1/ "Can not read device" -> -errno
2/ errno=0 && size=0 -> error msg distinct than "can not read device"
hw/vfio/pci.c static bool vfio_pci_load_rom(VFIOPCIDevice *vdev) · line 1059
Quoted 3 lines
hw/vfio/pci.c +0
-0error_printf ("Device option ROM contents are probably invalid " "(check dmesg).\nSkip option ROM probe with rombar=0, " "or load from file with romfile=\n" );
While here, let's replace error_printf() by error_append_hint().
Quoted 16 lines
hw/vfio/pci.c +6
-4@@ -1076,10 +1077,12 @@ static bool vfio_pci_load_rom(VFIOPCIDevice *vdev)if (bytes == -EINTR || bytes == -EAGAIN ) {continue ; } -error_report ("vfio: Error reading device ROM: %s" , -strreaderror (bytes)); - -break ; +error_setg_errno (errp, -bytes,"vfio: Error reading device ROM" ); +g_free (vdev->rom); + vdev->rom =NULL ; + vdev->rom_size =0 ; + vdev->rom_offset =0 ; +return false; } }