mirror of https://github.com/proxmox/mirror_qemu
hw/vfio/pci-quirks: Resolve redundant property getters
The QOM API already provides getters for uint64 and uint32 values, so reuse them. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20220301225220.239065-2-shentey@gmail.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>master
parent
bc57381669
commit
8f1b608798
|
@ -1565,22 +1565,6 @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void vfio_pci_nvlink2_get_tgt(Object *obj, Visitor *v,
|
|
||||||
const char *name,
|
|
||||||
void *opaque, Error **errp)
|
|
||||||
{
|
|
||||||
uint64_t tgt = (uintptr_t) opaque;
|
|
||||||
visit_type_uint64(v, name, &tgt, errp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void vfio_pci_nvlink2_get_link_speed(Object *obj, Visitor *v,
|
|
||||||
const char *name,
|
|
||||||
void *opaque, Error **errp)
|
|
||||||
{
|
|
||||||
uint32_t link_speed = (uint32_t)(uintptr_t) opaque;
|
|
||||||
visit_type_uint32(v, name, &link_speed, errp);
|
|
||||||
}
|
|
||||||
|
|
||||||
int vfio_pci_nvidia_v100_ram_init(VFIOPCIDevice *vdev, Error **errp)
|
int vfio_pci_nvidia_v100_ram_init(VFIOPCIDevice *vdev, Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -1618,9 +1602,9 @@ int vfio_pci_nvidia_v100_ram_init(VFIOPCIDevice *vdev, Error **errp)
|
||||||
nv2reg->size, p);
|
nv2reg->size, p);
|
||||||
QLIST_INSERT_HEAD(&vdev->bars[0].quirks, quirk, next);
|
QLIST_INSERT_HEAD(&vdev->bars[0].quirks, quirk, next);
|
||||||
|
|
||||||
object_property_add(OBJECT(vdev), "nvlink2-tgt", "uint64",
|
object_property_add_uint64_ptr(OBJECT(vdev), "nvlink2-tgt",
|
||||||
vfio_pci_nvlink2_get_tgt, NULL, NULL,
|
(uint64_t *) &cap->tgt,
|
||||||
(void *) (uintptr_t) cap->tgt);
|
OBJ_PROP_FLAG_READ);
|
||||||
trace_vfio_pci_nvidia_gpu_setup_quirk(vdev->vbasedev.name, cap->tgt,
|
trace_vfio_pci_nvidia_gpu_setup_quirk(vdev->vbasedev.name, cap->tgt,
|
||||||
nv2reg->size);
|
nv2reg->size);
|
||||||
free_exit:
|
free_exit:
|
||||||
|
@ -1679,15 +1663,15 @@ int vfio_pci_nvlink2_init(VFIOPCIDevice *vdev, Error **errp)
|
||||||
QLIST_INSERT_HEAD(&vdev->bars[0].quirks, quirk, next);
|
QLIST_INSERT_HEAD(&vdev->bars[0].quirks, quirk, next);
|
||||||
}
|
}
|
||||||
|
|
||||||
object_property_add(OBJECT(vdev), "nvlink2-tgt", "uint64",
|
object_property_add_uint64_ptr(OBJECT(vdev), "nvlink2-tgt",
|
||||||
vfio_pci_nvlink2_get_tgt, NULL, NULL,
|
(uint64_t *) &captgt->tgt,
|
||||||
(void *) (uintptr_t) captgt->tgt);
|
OBJ_PROP_FLAG_READ);
|
||||||
trace_vfio_pci_nvlink2_setup_quirk_ssatgt(vdev->vbasedev.name, captgt->tgt,
|
trace_vfio_pci_nvlink2_setup_quirk_ssatgt(vdev->vbasedev.name, captgt->tgt,
|
||||||
atsdreg->size);
|
atsdreg->size);
|
||||||
|
|
||||||
object_property_add(OBJECT(vdev), "nvlink2-link-speed", "uint32",
|
object_property_add_uint32_ptr(OBJECT(vdev), "nvlink2-link-speed",
|
||||||
vfio_pci_nvlink2_get_link_speed, NULL, NULL,
|
&capspeed->link_speed,
|
||||||
(void *) (uintptr_t) capspeed->link_speed);
|
OBJ_PROP_FLAG_READ);
|
||||||
trace_vfio_pci_nvlink2_setup_quirk_lnkspd(vdev->vbasedev.name,
|
trace_vfio_pci_nvlink2_setup_quirk_lnkspd(vdev->vbasedev.name,
|
||||||
capspeed->link_speed);
|
capspeed->link_speed);
|
||||||
free_exit:
|
free_exit:
|
||||||
|
|
Loading…
Reference in New Issue