On 5/15/24 10:20, Zhenzhong Duan wrote:
> This is to follow the coding standand in qapi/error.h to return bool
> for bool-valued functions.
>
> Suggested-by: Cédric Le Goater <clg@redhat.com>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/vfio/pci.h | 6 +++---
> hw/vfio/igd.c | 3 +--
> hw/vfio/pci-quirks.c | 8 ++++----
> hw/vfio/pci.c | 3 +--
> 4 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index 7914f019d5..f158681072 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -227,9 +227,9 @@ int vfio_pci_get_pci_hot_reset_info(VFIOPCIDevice *vdev,
>
> bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp);
>
> -int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> - struct vfio_region_info *info,
> - Error **errp);
> +bool vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> + struct vfio_region_info *info,
> + Error **errp);
>
> void vfio_display_reset(VFIOPCIDevice *vdev);
> bool vfio_display_probe(VFIOPCIDevice *vdev, Error **errp);
> diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
> index ffe57c5954..402fc5ce1d 100644
> --- a/hw/vfio/igd.c
> +++ b/hw/vfio/igd.c
> @@ -502,8 +502,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
> }
>
> /* Setup OpRegion access */
> - ret = vfio_pci_igd_opregion_init(vdev, opregion, &err);
> - if (ret) {
> + if (!vfio_pci_igd_opregion_init(vdev, opregion, &err)) {
> error_append_hint(&err, "IGD legacy mode disabled\n");
> error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
> goto out;
> diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
> index 496fd1ee86..ca27917159 100644
> --- a/hw/vfio/pci-quirks.c
> +++ b/hw/vfio/pci-quirks.c
> @@ -1169,8 +1169,8 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDevice *vdev, int nr)
> * the table and to write the base address of that memory to the ASLS register
> * of the IGD device.
> */
> -int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> - struct vfio_region_info *info, Error **errp)
> +bool vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> + struct vfio_region_info *info, Error **errp)
> {
> int ret;
>
> @@ -1181,7 +1181,7 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> error_setg(errp, "failed to read IGD OpRegion");
> g_free(vdev->igd_opregion);
> vdev->igd_opregion = NULL;
> - return -EINVAL;
> + return false;
> }
>
> /*
> @@ -1206,7 +1206,7 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
> pci_set_long(vdev->pdev.wmask + IGD_ASLS, ~0);
> pci_set_long(vdev->emulated_config_bits + IGD_ASLS, ~0);
>
> - return 0;
> + return true;
> }
>
> /*
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index be87478716..15823c359a 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -3164,8 +3164,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
> goto out_teardown;
> }
>
> - ret = vfio_pci_igd_opregion_init(vdev, opregion, errp);
> - if (ret) {
> + if (!vfio_pci_igd_opregion_init(vdev, opregion, errp)) {
> goto out_teardown;
> }
> }