mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfio: Introduce a helper function to initialize VFIODevice

Browse Source 
Introduce a helper function to replace the common code to initialize
VFIODevice in pci, platform, ap and ccw VFIO device.

No functional change intended.

Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Zhenzhong Duan
2023-11-21 16:44:25 +08:00
committed by Cédric Le Goater
parent c12b55ad6f
commit 6106a32914
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hw/vfio/ap.c
View File

@ -226,18 +226,14 @@ static void vfio_ap_instance_init(Object *obj)
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(obj); VFIOAPDevice *vapdev = VFIO_AP_DEVICE(obj);
VFIODevice *vbasedev = &vapdev->vdev; VFIODevice *vbasedev = &vapdev->vdev;
vbasedev->type = VFIO_DEVICE_TYPE_AP;
vbasedev->ops = &vfio_ap_ops;
vbasedev->dev = DEVICE(vapdev);
vbasedev->fd = -1;
/* /*
* vfio-ap devices operate in a way compatible with discarding of * vfio-ap devices operate in a way compatible with discarding of
* memory in RAM blocks, as no pages are pinned in the host. * memory in RAM blocks, as no pages are pinned in the host.
* This needs to be set before vfio_get_device() for vfio common to * This needs to be set before vfio_get_device() for vfio common to
* handle ram_block_discard_disable(). * handle ram_block_discard_disable().
*/ */
vbasedev->ram_block_discard_allowed = true; vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_AP, &vfio_ap_ops,
DEVICE(vapdev), true);
} }
#ifdef CONFIG_IOMMUFD #ifdef CONFIG_IOMMUFD

8
hw/vfio/ccw.c
View File

@ -683,11 +683,6 @@ static void vfio_ccw_instance_init(Object *obj)
VFIOCCWDevice *vcdev = VFIO_CCW(obj); VFIOCCWDevice *vcdev = VFIO_CCW(obj);
VFIODevice *vbasedev = &vcdev->vdev; VFIODevice *vbasedev = &vcdev->vdev;
vbasedev->type = VFIO_DEVICE_TYPE_CCW;
vbasedev->ops = &vfio_ccw_ops;
vbasedev->dev = DEVICE(vcdev);
vbasedev->fd = -1;
/* /*
* All vfio-ccw devices are believed to operate in a way compatible with * All vfio-ccw devices are believed to operate in a way compatible with
* discarding of memory in RAM blocks, ie. pages pinned in the host are * discarding of memory in RAM blocks, ie. pages pinned in the host are
@ -696,7 +691,8 @@ static void vfio_ccw_instance_init(Object *obj)
* needs to be set before vfio_get_device() for vfio common to handle * needs to be set before vfio_get_device() for vfio common to handle
* ram_block_discard_disable(). * ram_block_discard_disable().
*/ */
vbasedev->ram_block_discard_allowed = true; vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_CCW, &vfio_ccw_ops,
DEVICE(vcdev), true);
} }
#ifdef CONFIG_IOMMUFD #ifdef CONFIG_IOMMUFD

11
hw/vfio/helpers.c
View File

@ -652,3 +652,14 @@ void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp)
} }
vbasedev->fd = fd; vbasedev->fd = fd;
} }
void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops,
DeviceState *dev, bool ram_discard)
{
vbasedev->type = type;
vbasedev->ops = ops;
vbasedev->dev = dev;
vbasedev->fd = -1;
vbasedev->ram_block_discard_allowed = ram_discard;
}

6
hw/vfio/pci.c
View File

@ -3327,10 +3327,8 @@ static void vfio_instance_init(Object *obj)
vdev->host.slot = ~0U; vdev->host.slot = ~0U;
vdev->host.function = ~0U; vdev->host.function = ~0U;
vbasedev->type = VFIO_DEVICE_TYPE_PCI; vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_PCI, &vfio_pci_ops,
vbasedev->ops = &vfio_pci_ops; DEVICE(vdev), false);
vbasedev->dev = DEVICE(vdev);
vbasedev->fd = -1;
vdev->nv_gpudirect_clique = 0xFF; vdev->nv_gpudirect_clique = 0xFF;

6
hw/vfio/platform.c
View File

@ -657,10 +657,8 @@ static void vfio_platform_instance_init(Object *obj)
VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(obj); VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(obj);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM; vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_PLATFORM, &vfio_platform_ops,
vbasedev->ops = &vfio_platform_ops; DEVICE(vdev), false);
vbasedev->dev = DEVICE(vdev);
vbasedev->fd = -1;
} }
#ifdef CONFIG_IOMMUFD #ifdef CONFIG_IOMMUFD

2
include/hw/vfio/vfio-common.h
View File

@ -257,4 +257,6 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova,
/* Returns 0 on success, or a negative errno. */ /* Returns 0 on success, or a negative errno. */
int vfio_device_get_name(VFIODevice *vbasedev, Error **errp); int vfio_device_get_name(VFIODevice *vbasedev, Error **errp);
void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp); void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp);
void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops,
DeviceState *dev, bool ram_discard);
#endif /* HW_VFIO_VFIO_COMMON_H */ #endif /* HW_VFIO_VFIO_COMMON_H */