motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 09:32:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vfio/platform: Make vfio_populate_device() and vfio_base_device_init() return bool

Browse source 
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>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Zhenzhong Duan 2024-05-22 12:40:01 +08:00 • committed by Cédric Le Goater
parent c6c6cf91c0
commit 958609cfeb
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
hw/vfio/platform.c
View file

@ -441,7 +441,7 @@ static int vfio_platform_hot_reset_multi(VFIODevice *vbasedev)
* @errp: error object * @errp: error object
* *
*/ */
static int vfio_populate_device(VFIODevice *vbasedev, Error **errp) static bool vfio_populate_device(VFIODevice *vbasedev, Error **errp)
{ {
VFIOINTp *intp, *tmp; VFIOINTp *intp, *tmp;
int i, ret = -1; int i, ret = -1;
@ -450,7 +450,7 @@ static int vfio_populate_device(VFIODevice *vbasedev, Error **errp)
if (!(vbasedev->flags & VFIO_DEVICE_FLAGS_PLATFORM)) { if (!(vbasedev->flags & VFIO_DEVICE_FLAGS_PLATFORM)) {
error_setg(errp, "this isn't a platform device"); error_setg(errp, "this isn't a platform device");
return ret; return false;
} }
vdev->regions = g_new0(VFIORegion *, vbasedev->num_regions); vdev->regions = g_new0(VFIORegion *, vbasedev->num_regions);
@ -487,12 +487,11 @@ static int vfio_populate_device(VFIODevice *vbasedev, Error **errp)
irq.flags); irq.flags);
intp = vfio_init_intp(vbasedev, irq, errp); intp = vfio_init_intp(vbasedev, irq, errp);
if (!intp) { if (!intp) {
ret = -1;
goto irq_err; goto irq_err;
} }
} }
} }
return 0; return true;
irq_err: irq_err:
timer_del(vdev->mmap_timer); timer_del(vdev->mmap_timer);
QLIST_FOREACH_SAFE(intp, &vdev->intp_list, next, tmp) { QLIST_FOREACH_SAFE(intp, &vdev->intp_list, next, tmp) {
@ -507,7 +506,7 @@ reg_error:
g_free(vdev->regions[i]); g_free(vdev->regions[i]);
} }
g_free(vdev->regions); g_free(vdev->regions);
return ret; return false;
} }
/* specialized functions for VFIO Platform devices */ /* specialized functions for VFIO Platform devices */
@ -527,10 +526,8 @@ static VFIODeviceOps vfio_platform_ops = {
* fd retrieval, resource query. * fd retrieval, resource query.
* Precondition: the device name must be initialized * Precondition: the device name must be initialized
*/ */
static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp) static bool vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
{ {
int ret;
/* @fd takes precedence over @sysfsdev which takes precedence over @host */ /* @fd takes precedence over @sysfsdev which takes precedence over @host */
if (vbasedev->fd < 0 && vbasedev->sysfsdev) { if (vbasedev->fd < 0 && vbasedev->sysfsdev) {
g_free(vbasedev->name); g_free(vbasedev->name);
@ -538,7 +535,7 @@ static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
} else if (vbasedev->fd < 0) { } else if (vbasedev->fd < 0) {
if (!vbasedev->name || strchr(vbasedev->name, '/')) { if (!vbasedev->name || strchr(vbasedev->name, '/')) {
error_setg(errp, "wrong host device name"); error_setg(errp, "wrong host device name");
return -EINVAL; return false;
} }
vbasedev->sysfsdev = g_strdup_printf("/sys/bus/platform/devices/%s", vbasedev->sysfsdev = g_strdup_printf("/sys/bus/platform/devices/%s",
@ -546,20 +543,20 @@ static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
} }
if (!vfio_device_get_name(vbasedev, errp)) { if (!vfio_device_get_name(vbasedev, errp)) {
return -EINVAL; return false;
} }
if (!vfio_attach_device(vbasedev->name, vbasedev, if (!vfio_attach_device(vbasedev->name, vbasedev,
&address_space_memory, errp)) { &address_space_memory, errp)) {
return -EINVAL; return false;
}
if (vfio_populate_device(vbasedev, errp)) {
return true;
} }
ret = vfio_populate_device(vbasedev, errp);
if (ret) {
vfio_detach_device(vbasedev); vfio_detach_device(vbasedev);
} return false;
return ret;
} }
/** /**
@ -576,7 +573,7 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)
VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev); VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev);
SysBusDevice *sbdev = SYS_BUS_DEVICE(dev); SysBusDevice *sbdev = SYS_BUS_DEVICE(dev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
int i, ret; int i;
qemu_mutex_init(&vdev->intp_mutex); qemu_mutex_init(&vdev->intp_mutex);
@ -584,9 +581,8 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)
vbasedev->sysfsdev : vbasedev->name, vbasedev->sysfsdev : vbasedev->name,
vdev->compat); vdev->compat);
ret = vfio_base_device_init(vbasedev, errp); if (!vfio_base_device_init(vbasedev, errp)) {
if (ret) { goto init_err;
goto out;
} }
if (!vdev->compat) { if (!vdev->compat) {
@ -618,11 +614,9 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)
} }
sysbus_init_mmio(sbdev, vdev->regions[i]->mem); sysbus_init_mmio(sbdev, vdev->regions[i]->mem);
} }
out:
if (!ret) {
return; return;
}
init_err:
if (vdev->vbasedev.name) { if (vdev->vbasedev.name) {
error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.name); error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.name);
} else { } else {