riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

hw/vfio/types.h: rename TYPE_VFIO_PCI_BASE to TYPE_VFIO_PCI_DEVICE 

This brings the QOM type name in line with the underlying VFIOPCIDevice structure.

Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250925113159.1760317-17-mark.caveayland@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
pull/305/head
Mark Cave-Ayland 11 months ago
committed by Cédric Le Goater
parent
25c8376b37
commit
af2a8bfb3c
6 changed files with 32 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      hw/s390x/s390-pci-vfio.c
  2. 13
      hw/vfio-user/pci.c
  3. 2
      hw/vfio/device.c
  4. 28
      hw/vfio/pci.c
  5. 2
      hw/vfio/pci.h
  6. 4
      hw/vfio/types.h

14
hw/s390x/s390-pci-vfio.c
View File

@ -62,7 +62,7 @@ S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s,
{ {
S390PCIDMACount *cnt; S390PCIDMACount *cnt;
uint32_t avail; uint32_t avail;
VFIOPCIDevice *vpdev = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vpdev = VFIO_PCI_DEVICE(pbdev->pdev);
int id; int id;
assert(vpdev); assert(vpdev);
@ -108,7 +108,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
{ {
struct vfio_info_cap_header *hdr; struct vfio_info_cap_header *hdr;
struct vfio_device_info_cap_zpci_base *cap; struct vfio_device_info_cap_zpci_base *cap;
VFIOPCIDevice *vpci = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vpci = VFIO_PCI_DEVICE(pbdev->pdev);
uint64_t vfio_size; uint64_t vfio_size;
hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_BASE); hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_BASE);
@ -162,7 +162,7 @@ static bool get_host_fh(S390PCIBusDevice *pbdev, struct vfio_device_info *info,
{ {
struct vfio_info_cap_header *hdr; struct vfio_info_cap_header *hdr;
struct vfio_device_info_cap_zpci_base *cap; struct vfio_device_info_cap_zpci_base *cap;
VFIOPCIDevice *vpci = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vpci = VFIO_PCI_DEVICE(pbdev->pdev);
hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_BASE); hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_BASE);
@ -185,7 +185,7 @@ static void s390_pci_read_group(S390PCIBusDevice *pbdev,
struct vfio_device_info_cap_zpci_group *cap; struct vfio_device_info_cap_zpci_group *cap;
S390pciState *s = s390_get_phb(); S390pciState *s = s390_get_phb();
ClpRspQueryPciGrp *resgrp; ClpRspQueryPciGrp *resgrp;
VFIOPCIDevice *vpci = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vpci = VFIO_PCI_DEVICE(pbdev->pdev);
uint8_t start_gid = pbdev->zpci_fn.pfgid; uint8_t start_gid = pbdev->zpci_fn.pfgid;
hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_GROUP); hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_GROUP);
@ -264,7 +264,7 @@ static void s390_pci_read_util(S390PCIBusDevice *pbdev,
{ {
struct vfio_info_cap_header *hdr; struct vfio_info_cap_header *hdr;
struct vfio_device_info_cap_zpci_util *cap; struct vfio_device_info_cap_zpci_util *cap;
VFIOPCIDevice *vpci = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vpci = VFIO_PCI_DEVICE(pbdev->pdev);
hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_UTIL); hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_UTIL);
@ -291,7 +291,7 @@ static void s390_pci_read_pfip(S390PCIBusDevice *pbdev,
{ {
struct vfio_info_cap_header *hdr; struct vfio_info_cap_header *hdr;
struct vfio_device_info_cap_zpci_pfip *cap; struct vfio_device_info_cap_zpci_pfip *cap;
VFIOPCIDevice *vpci = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vpci = VFIO_PCI_DEVICE(pbdev->pdev);
hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_PFIP); hdr = vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_PFIP);
@ -314,7 +314,7 @@ static void s390_pci_read_pfip(S390PCIBusDevice *pbdev,
static struct vfio_device_info *get_device_info(S390PCIBusDevice *pbdev) static struct vfio_device_info *get_device_info(S390PCIBusDevice *pbdev)
{ {
VFIOPCIDevice *vfio_pci = VFIO_PCI_BASE(pbdev->pdev); VFIOPCIDevice *vfio_pci = VFIO_PCI_DEVICE(pbdev->pdev);
return vfio_get_device_info(vfio_pci->vbasedev.fd); return vfio_get_device_info(vfio_pci->vbasedev.fd);
} }

13
hw/vfio-user/pci.c
View File

@ -234,9 +234,10 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
{ {
ERRP_GUARD(); ERRP_GUARD();
VFIOUserPCIDevice *udev = VFIO_USER_PCI(pdev); VFIOUserPCIDevice *udev = VFIO_USER_PCI(pdev);
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
const char *sock_name; const char *sock_name;
AddressSpace *as; AddressSpace *as;
SocketAddress addr; SocketAddress addr;
VFIOUserProxy *proxy; VFIOUserProxy *proxy;
@ -346,7 +347,7 @@ error:
static void vfio_user_instance_init(Object *obj) static void vfio_user_instance_init(Object *obj)
{ {
PCIDevice *pci_dev = PCI_DEVICE(obj); PCIDevice *pci_dev = PCI_DEVICE(obj);
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(obj);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
device_add_bootindex_property(obj, &vdev->bootindex, device_add_bootindex_property(obj, &vdev->bootindex,
@ -371,7 +372,7 @@ static void vfio_user_instance_init(Object *obj)
static void vfio_user_instance_finalize(Object *obj) static void vfio_user_instance_finalize(Object *obj)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(obj);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
if (vdev->msix != NULL) { if (vdev->msix != NULL) {
@ -387,7 +388,7 @@ static void vfio_user_instance_finalize(Object *obj)
static void vfio_user_pci_reset(DeviceState *dev) static void vfio_user_pci_reset(DeviceState *dev)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(dev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(dev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
vfio_pci_pre_reset(vdev); vfio_pci_pre_reset(vdev);
@ -421,7 +422,7 @@ static void vfio_user_pci_set_socket(Object *obj, Visitor *v, const char *name,
VFIOUserPCIDevice *udev = VFIO_USER_PCI(obj); VFIOUserPCIDevice *udev = VFIO_USER_PCI(obj);
bool success; bool success;
if (VFIO_PCI_BASE(udev)->vbasedev.proxy) { if (VFIO_PCI_DEVICE(udev)->vbasedev.proxy) {
error_setg(errp, "Proxy is connected"); error_setg(errp, "Proxy is connected");
return; return;
} }
@ -464,7 +465,7 @@ static void vfio_user_pci_dev_class_init(ObjectClass *klass, const void *data)
static const TypeInfo vfio_user_pci_dev_info = { static const TypeInfo vfio_user_pci_dev_info = {
.name = TYPE_VFIO_USER_PCI, .name = TYPE_VFIO_USER_PCI,
.parent = TYPE_VFIO_PCI_BASE, .parent = TYPE_VFIO_PCI_DEVICE,
.instance_size = sizeof(VFIOUserPCIDevice), .instance_size = sizeof(VFIOUserPCIDevice),
.class_init = vfio_user_pci_dev_class_init, .class_init = vfio_user_pci_dev_class_init,
.instance_init = vfio_user_instance_init, .instance_init = vfio_user_instance_init,

2
hw/vfio/device.c
View File

@ -423,7 +423,7 @@ bool vfio_device_hiod_create_and_realize(VFIODevice *vbasedev,
VFIODevice *vfio_get_vfio_device(Object *obj) VFIODevice *vfio_get_vfio_device(Object *obj)
{ {
if (object_dynamic_cast(obj, TYPE_VFIO_PCI)) { if (object_dynamic_cast(obj, TYPE_VFIO_PCI)) {
return &VFIO_PCI_BASE(obj)->vbasedev; return &VFIO_PCI_DEVICE(obj)->vbasedev;
} else { } else {
return NULL; return NULL;
} }

28
hw/vfio/pci.c
View File

@ -305,7 +305,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)
static void vfio_intx_routing_notifier(PCIDevice *pdev) static void vfio_intx_routing_notifier(PCIDevice *pdev)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
PCIINTxRoute route; PCIINTxRoute route;
if (vdev->interrupt != VFIO_INT_INTx) { if (vdev->interrupt != VFIO_INT_INTx) {
@ -660,7 +660,7 @@ void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr)
static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
MSIMessage *msg, IOHandler *handler) MSIMessage *msg, IOHandler *handler)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIOMSIVector *vector; VFIOMSIVector *vector;
int ret; int ret;
bool resizing = !!(vdev->nr_vectors < nr + 1); bool resizing = !!(vdev->nr_vectors < nr + 1);
@ -755,7 +755,7 @@ static int vfio_msix_vector_use(PCIDevice *pdev,
static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIOMSIVector *vector = &vdev->msi_vectors[nr]; VFIOMSIVector *vector = &vdev->msi_vectors[nr];
trace_vfio_msix_vector_release(vdev->vbasedev.name, nr); trace_vfio_msix_vector_release(vdev->vbasedev.name, nr);
@ -1346,7 +1346,7 @@ static const MemoryRegionOps vfio_vga_ops = {
*/ */
static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIORegion *region = &vdev->bars[bar].region; VFIORegion *region = &vdev->bars[bar].region;
MemoryRegion *mmap_mr, *region_mr, *base_mr; MemoryRegion *mmap_mr, *region_mr, *base_mr;
PCIIORegion *r; PCIIORegion *r;
@ -1392,7 +1392,7 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar)
*/ */
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val; uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val;
@ -1426,7 +1426,7 @@ uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)
void vfio_pci_write_config(PCIDevice *pdev, void vfio_pci_write_config(PCIDevice *pdev,
uint32_t addr, uint32_t val, int len) uint32_t addr, uint32_t val, int len)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
uint32_t val_le = cpu_to_le32(val); uint32_t val_le = cpu_to_le32(val);
int ret; int ret;
@ -3392,7 +3392,7 @@ bool vfio_pci_interrupt_setup(VFIOPCIDevice *vdev, Error **errp)
static void vfio_pci_realize(PCIDevice *pdev, Error **errp) static void vfio_pci_realize(PCIDevice *pdev, Error **errp)
{ {
ERRP_GUARD(); ERRP_GUARD();
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
int i; int i;
char uuid[UUID_STR_LEN]; char uuid[UUID_STR_LEN];
@ -3552,14 +3552,14 @@ error:
static void vfio_pci_finalize(Object *obj) static void vfio_pci_finalize(Object *obj)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(obj);
vfio_pci_put_device(vdev); vfio_pci_put_device(vdev);
} }
static void vfio_exitfn(PCIDevice *pdev) static void vfio_exitfn(PCIDevice *pdev)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(pdev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(pdev);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
vfio_unregister_req_notifier(vdev); vfio_unregister_req_notifier(vdev);
@ -3583,7 +3583,7 @@ static void vfio_exitfn(PCIDevice *pdev)
static void vfio_pci_reset(DeviceState *dev) static void vfio_pci_reset(DeviceState *dev)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(dev); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(dev);
/* Do not reset the device during qemu_system_reset prior to cpr load */ /* Do not reset the device during qemu_system_reset prior to cpr load */
if (cpr_is_incoming()) { if (cpr_is_incoming()) {
@ -3628,7 +3628,7 @@ post_reset:
static void vfio_pci_init(Object *obj) static void vfio_pci_init(Object *obj)
{ {
PCIDevice *pci_dev = PCI_DEVICE(obj); PCIDevice *pci_dev = PCI_DEVICE(obj);
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(obj);
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
device_add_bootindex_property(obj, &vdev->bootindex, device_add_bootindex_property(obj, &vdev->bootindex,
@ -3669,7 +3669,7 @@ static void vfio_pci_base_dev_class_init(ObjectClass *klass, const void *data)
} }
static const TypeInfo vfio_pci_base_dev_info = { static const TypeInfo vfio_pci_base_dev_info = {
.name = TYPE_VFIO_PCI_BASE, .name = TYPE_VFIO_PCI_DEVICE,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VFIOPCIDevice), .instance_size = sizeof(VFIOPCIDevice),
.abstract = true, .abstract = true,
@ -3758,7 +3758,7 @@ static const Property vfio_pci_dev_properties[] = {
#ifdef CONFIG_IOMMUFD #ifdef CONFIG_IOMMUFD
static void vfio_pci_set_fd(Object *obj, const char *str, Error **errp) static void vfio_pci_set_fd(Object *obj, const char *str, Error **errp)
{ {
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(obj);
vfio_device_set_fd(&vdev->vbasedev, str, errp); vfio_device_set_fd(&vdev->vbasedev, str, errp);
} }
#endif #endif
@ -3914,7 +3914,7 @@ static void vfio_pci_class_init(ObjectClass *klass, const void *data)
static const TypeInfo vfio_pci_info = { static const TypeInfo vfio_pci_info = {
.name = TYPE_VFIO_PCI, .name = TYPE_VFIO_PCI,
.parent = TYPE_VFIO_PCI_BASE, .parent = TYPE_VFIO_PCI_DEVICE,
.class_init = vfio_pci_class_init, .class_init = vfio_pci_class_init,
.instance_init = vfio_pci_init, .instance_init = vfio_pci_init,
.instance_finalize = vfio_pci_finalize, .instance_finalize = vfio_pci_finalize,

2
hw/vfio/pci.h
View File

@ -120,7 +120,7 @@ typedef struct VFIOMSIXInfo {
MemoryRegion *pba_region; MemoryRegion *pba_region;
} VFIOMSIXInfo; } VFIOMSIXInfo;
OBJECT_DECLARE_SIMPLE_TYPE(VFIOPCIDevice, VFIO_PCI_BASE) OBJECT_DECLARE_SIMPLE_TYPE(VFIOPCIDevice, VFIO_PCI_DEVICE)
struct VFIOPCIDevice { struct VFIOPCIDevice {
PCIDevice parent_obj; PCIDevice parent_obj;

4
hw/vfio/types.h
View File

@ -9,11 +9,11 @@
#define HW_VFIO_VFIO_TYPES_H #define HW_VFIO_VFIO_TYPES_H
/* /*
* TYPE_VFIO_PCI_BASE is an abstract type used to share code * TYPE_VFIO_PCI_DEVICE is an abstract type used to share code
* between VFIO implementations that use a kernel driver * between VFIO implementations that use a kernel driver
* with those that use user sockets. * with those that use user sockets.
*/ */
#define TYPE_VFIO_PCI_BASE "vfio-pci-base" #define TYPE_VFIO_PCI_DEVICE "vfio-pci-device"
#define TYPE_VFIO_PCI "vfio-pci" #define TYPE_VFIO_PCI "vfio-pci"
/* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */ /* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */

Write Preview
Loading…
Cancel
Save