Re: [PATCH 12/16] vfio/pci: Make vfio_populate_vga() return bool

[Cédric Le Goater]

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 <c...@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.d...@intel.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/vfio/pci.h |  2 +-
  hw/vfio/igd.c |  2 +-
  hw/vfio/pci.c | 11 +++++------
  3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index a5ac9efd4b..7914f019d5 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -225,7 +225,7 @@ bool vfio_pci_host_match(PCIHostDeviceAddress *addr, const 
char *name);
  int vfio_pci_get_pci_hot_reset_info(VFIOPCIDevice *vdev,
                                      struct vfio_pci_hot_reset_info **info_p);

-int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp);

+bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp);

int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,

                                 struct vfio_region_info *info,
diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index b31ee79c60..ffe57c5954 100644
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -478,7 +478,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
       * try to enable it.  Probably shouldn't be using legacy mode without VGA,
       * but also no point in us enabling VGA if disabled in hardware.
       */
-    if (!(gmch & 0x2) && !vdev->vga && vfio_populate_vga(vdev, &err)) {
+    if (!(gmch & 0x2) && !vdev->vga && !vfio_populate_vga(vdev, &err)) {
          error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
          error_report("IGD device %s failed to enable VGA access, "
                       "legacy mode disabled", vdev->vbasedev.name);
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e2ca4507f8..1922593253 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2670,7 +2670,7 @@ static VFIODeviceOps vfio_pci_ops = {
      .vfio_load_config = vfio_pci_load_config,
  };

-int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)

+bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
  {
      VFIODevice *vbasedev = &vdev->vbasedev;
      struct vfio_region_info *reg_info;
@@ -2681,7 +2681,7 @@ int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
          error_setg_errno(errp, -ret,
                           "failed getting region info for VGA region index %d",
                           VFIO_PCI_VGA_REGION_INDEX);
-        return ret;
+        return false;
      }

if (!(reg_info->flags & VFIO_REGION_INFO_FLAG_READ) ||

@@ -2691,7 +2691,7 @@ int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
                     (unsigned long)reg_info->flags,
                     (unsigned long)reg_info->size);
          g_free(reg_info);
-        return -EINVAL;
+        return false;
      }

vdev->vga = g_new0(VFIOVGA, 1);

@@ -2735,7 +2735,7 @@ int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
                       &vdev->vga->region[QEMU_PCI_VGA_IO_LO].mem,
                       &vdev->vga->region[QEMU_PCI_VGA_IO_HI].mem);

- return 0;

+    return true;
  }

static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)

@@ -2798,8 +2798,7 @@ static bool vfio_populate_device(VFIOPCIDevice *vdev, 
Error **errp)
      g_free(reg_info);

if (vdev->features & VFIO_FEATURE_ENABLE_VGA) {

-        ret = vfio_populate_vga(vdev, errp);
-        if (ret) {
+        if (!vfio_populate_vga(vdev, errp)) {
              error_append_hint(errp, "device does not support "
                                "requested feature x-vga\n");
              return false;