From c0cad7dde740ad701c4a095c607970e1f76ad720 Mon Sep 17 00:00:00 2001

From: Alex Williamson <alex.williamson@redhat.com>

Date: Fri, 29 Sep 2017 21:44:12 +0200

Subject: [PATCH 02/27] hw/vfio/pci: Rename VFIODevice into VFIOPCIDevice

RH-Author: Alex Williamson <alex.williamson@redhat.com>

Message-id: <20170929214412.16765.59126.stgit@gimli.home>

Patchwork-id: 76760

O-Subject: [RHEL-7.5 qemu-kvm PATCH 02/16] hw/vfio/pci: Rename VFIODevice into VFIOPCIDevice

Bugzilla: 1494181

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Auger Eric <eric.auger@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Eric Auger <eric.auger@linaro.org>

Upstream: 9ee27d7381c2d540ee976c7cbae941c66bb66e70

RHEL: Request notifier didn't exist upstream yet, included in change.

This prepares for the introduction of VFIOPlatformDevice

Signed-off-by: Eric Auger <eric.auger@linaro.org>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/misc/vfio.c | 209 +++++++++++++++++++++++++++++----------------------------

 1 file changed, 105 insertions(+), 104 deletions(-)

diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c

index 363c646..a1ca883 100644

--- a/hw/misc/vfio.c

+++ b/hw/misc/vfio.c

@@ -55,11 +55,11 @@

 #define VFIO_ALLOW_KVM_MSI 1

 #define VFIO_ALLOW_KVM_MSIX 1

-struct VFIODevice;

+struct VFIOPCIDevice;

 typedef struct VFIOQuirk {

     MemoryRegion mem;

-    struct VFIODevice *vdev;

+    struct VFIOPCIDevice *vdev;

     QLIST_ENTRY(VFIOQuirk) next;

     struct {

         uint32_t base_offset:TARGET_PAGE_BITS;

@@ -130,7 +130,7 @@ typedef struct VFIOMSIVector {

      */

     EventNotifier interrupt;

     EventNotifier kvm_interrupt;

-    struct VFIODevice *vdev; /* back pointer to device */

+    struct VFIOPCIDevice *vdev; /* back pointer to device */

     int virq;

     bool use;

 } VFIOMSIVector;

@@ -174,7 +174,7 @@ typedef struct VFIOMSIXInfo {

     void *mmap;

 } VFIOMSIXInfo;

-typedef struct VFIODevice {

+typedef struct VFIOPCIDevice {

     PCIDevice pdev;

     int fd;

     VFIOINTx intx;

@@ -192,7 +192,7 @@ typedef struct VFIODevice {

     VFIOBAR bars[PCI_NUM_REGIONS - 1]; /* No ROM */

     VFIOVGA vga; /* 0xa0000, 0x3b0, 0x3c0 */

     PCIHostDeviceAddress host;

-    QLIST_ENTRY(VFIODevice) next;

+    QLIST_ENTRY(VFIOPCIDevice) next;

     struct VFIOGroup *group;

     EventNotifier err_notifier;

     EventNotifier req_notifier;

@@ -211,13 +211,13 @@ typedef struct VFIODevice {

     bool has_pm_reset;

     bool needs_reset;

     bool rom_read_failed;

-} VFIODevice;

+} VFIOPCIDevice;

 typedef struct VFIOGroup {

     int fd;

     int groupid;

     VFIOContainer *container;

-    QLIST_HEAD(, VFIODevice) device_list;

+    QLIST_HEAD(, VFIOPCIDevice) device_list;

     QLIST_ENTRY(VFIOGroup) next;

     QLIST_ENTRY(VFIOGroup) container_next;

 } VFIOGroup;

@@ -263,16 +263,16 @@ static QLIST_HEAD(, VFIOGroup)

  */

 static int vfio_kvm_device_fd = -1;

-static void vfio_disable_interrupts(VFIODevice *vdev);

+static void vfio_disable_interrupts(VFIOPCIDevice *vdev);

 static uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);

 static void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr,

                                   uint32_t val, int len);

-static void vfio_mmap_set_enabled(VFIODevice *vdev, bool enabled);

+static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);

 /*

  * Common VFIO interrupt disable

  */

-static void vfio_disable_irqindex(VFIODevice *vdev, int index)

+static void vfio_disable_irqindex(VFIOPCIDevice *vdev, int index)

 {

     struct vfio_irq_set irq_set = {

         .argsz = sizeof(irq_set),

@@ -288,7 +288,7 @@ static void vfio_disable_irqindex(VFIODevice *vdev, int index)

 /*

  * INTx

  */

-static void vfio_unmask_intx(VFIODevice *vdev)

+static void vfio_unmask_intx(VFIOPCIDevice *vdev)

 {

     struct vfio_irq_set irq_set = {

         .argsz = sizeof(irq_set),

@@ -302,7 +302,7 @@ static void vfio_unmask_intx(VFIODevice *vdev)

 }

 #ifdef CONFIG_KVM /* Unused outside of CONFIG_KVM code */

-static void vfio_mask_intx(VFIODevice *vdev)

+static void vfio_mask_intx(VFIOPCIDevice *vdev)

 {

     struct vfio_irq_set irq_set = {

         .argsz = sizeof(irq_set),

@@ -333,7 +333,7 @@ static void vfio_mask_intx(VFIODevice *vdev)

  */

 static void vfio_intx_mmap_enable(void *opaque)

 {

-    VFIODevice *vdev = opaque;

+    VFIOPCIDevice *vdev = opaque;

     if (vdev->intx.pending) {

         qemu_mod_timer(vdev->intx.mmap_timer,

@@ -346,7 +346,7 @@ static void vfio_intx_mmap_enable(void *opaque)

 static void vfio_intx_interrupt(void *opaque)

 {

-    VFIODevice *vdev = opaque;

+    VFIOPCIDevice *vdev = opaque;

     if (!event_notifier_test_and_clear(&vdev->intx.interrupt)) {

         return;

@@ -365,7 +365,7 @@ static void vfio_intx_interrupt(void *opaque)

     }

 }

-static void vfio_eoi(VFIODevice *vdev)

+static void vfio_eoi(VFIOPCIDevice *vdev)

 {

     if (!vdev->intx.pending) {

         return;

@@ -379,7 +379,7 @@ static void vfio_eoi(VFIODevice *vdev)

     vfio_unmask_intx(vdev);

 }

-static void vfio_enable_intx_kvm(VFIODevice *vdev)

+static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev)

 {

 #ifdef CONFIG_KVM

     struct kvm_irqfd irqfd = {

@@ -458,7 +458,7 @@ fail:

 #endif

 }

-static void vfio_disable_intx_kvm(VFIODevice *vdev)

+static void vfio_disable_intx_kvm(VFIOPCIDevice *vdev)

 {

 #ifdef CONFIG_KVM

     struct kvm_irqfd irqfd = {

@@ -503,7 +503,7 @@ static void vfio_disable_intx_kvm(VFIODevice *vdev)

 static void vfio_update_irq(PCIDevice *pdev)

 {

-    VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev);

+    VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     PCIINTxRoute route;

     if (vdev->interrupt != VFIO_INT_INTx) {

@@ -534,7 +534,7 @@ static void vfio_update_irq(PCIDevice *pdev)

     vfio_eoi(vdev);

 }

-static int vfio_enable_intx(VFIODevice *vdev)

+static int vfio_enable_intx(VFIOPCIDevice *vdev)

 {

     uint8_t pin = vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1);

     int ret, argsz;

@@ -599,7 +599,7 @@ static int vfio_enable_intx(VFIODevice *vdev)

     return 0;

 }

-static void vfio_disable_intx(VFIODevice *vdev)

+static void vfio_disable_intx(VFIOPCIDevice *vdev)

 {

     int fd;

@@ -626,7 +626,7 @@ static void vfio_disable_intx(VFIODevice *vdev)

 static void vfio_msi_interrupt(void *opaque)

 {

     VFIOMSIVector *vector = opaque;

-    VFIODevice *vdev = vector->vdev;

+    VFIOPCIDevice *vdev = vector->vdev;

     int nr = vector - vdev->msi_vectors;

     if (!event_notifier_test_and_clear(&vector->interrupt)) {

@@ -658,7 +658,7 @@ static void vfio_msi_interrupt(void *opaque)

     }

 }

-static int vfio_enable_vectors(VFIODevice *vdev, bool msix)

+static int vfio_enable_vectors(VFIOPCIDevice *vdev, bool msix)

 {

     struct vfio_irq_set *irq_set;

     int ret = 0, i, argsz;

@@ -749,7 +749,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg)

 static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,

                                    MSIMessage *msg, IOHandler *handler)

 {

-    VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev);

+    VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     VFIOMSIVector *vector;

     int ret;

@@ -838,7 +838,7 @@ static int vfio_msix_vector_use(PCIDevice *pdev,

 static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)

 {

-    VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev);

+    VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     VFIOMSIVector *vector = &vdev->msi_vectors[nr];

     DPRINTF("%s(%04x:%02x:%02x.%x) vector %d released\n", __func__,

@@ -877,7 +877,7 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)

     }

 }

-static void vfio_enable_msix(VFIODevice *vdev)

+static void vfio_enable_msix(VFIOPCIDevice *vdev)

 {

     vfio_disable_interrupts(vdev);

@@ -910,7 +910,7 @@ static void vfio_enable_msix(VFIODevice *vdev)

             vdev->host.bus, vdev->host.slot, vdev->host.function);

 }

-static void vfio_enable_msi(VFIODevice *vdev)

+static void vfio_enable_msi(VFIOPCIDevice *vdev)

 {

     int ret, i;

@@ -988,7 +988,7 @@ retry:

             vdev->host.function, vdev->nr_vectors);

 }

-static void vfio_disable_msi_common(VFIODevice *vdev)

+static void vfio_disable_msi_common(VFIOPCIDevice *vdev)

 {

     int i;

@@ -1012,7 +1012,7 @@ static void vfio_disable_msi_common(VFIODevice *vdev)

     vfio_enable_intx(vdev);

 }

-static void vfio_disable_msix(VFIODevice *vdev)

+static void vfio_disable_msix(VFIOPCIDevice *vdev)

 {

     int i;

@@ -1039,7 +1039,7 @@ static void vfio_disable_msix(VFIODevice *vdev)

             vdev->host.bus, vdev->host.slot, vdev->host.function);

 }

-static void vfio_disable_msi(VFIODevice *vdev)

+static void vfio_disable_msi(VFIOPCIDevice *vdev)

 {

     vfio_disable_irqindex(vdev, VFIO_PCI_MSI_IRQ_INDEX);

     vfio_disable_msi_common(vdev);

@@ -1048,7 +1048,7 @@ static void vfio_disable_msi(VFIODevice *vdev)

             vdev->host.bus, vdev->host.slot, vdev->host.function);

 }

-static void vfio_update_msi(VFIODevice *vdev)

+static void vfio_update_msi(VFIOPCIDevice *vdev)

 {

     int i;

@@ -1101,7 +1101,7 @@ static void vfio_bar_write(void *opaque, hwaddr addr,

 #ifdef DEBUG_VFIO

     {

-        VFIODevice *vdev = container_of(bar, VFIODevice, bars[bar->nr]);

+        VFIOPCIDevice *vdev = container_of(bar, VFIOPCIDevice, bars[bar->nr]);

         DPRINTF("%s(%04x:%02x:%02x.%x:BAR%d+0x%"HWADDR_PRIx", 0x%"PRIx64

                 ", %d)\n", __func__, vdev->host.domain, vdev->host.bus,

@@ -1118,7 +1118,7 @@ static void vfio_bar_write(void *opaque, hwaddr addr,

      * which access will service the interrupt, so we're potentially

      * getting quite a few host interrupts per guest interrupt.

      */

-    vfio_eoi(container_of(bar, VFIODevice, bars[bar->nr]));

+    vfio_eoi(container_of(bar, VFIOPCIDevice, bars[bar->nr]));

 }

 static uint64_t vfio_bar_read(void *opaque,

@@ -1156,7 +1156,7 @@ static uint64_t vfio_bar_read(void *opaque,

 #ifdef DEBUG_VFIO

     {

-        VFIODevice *vdev = container_of(bar, VFIODevice, bars[bar->nr]);

+        VFIOPCIDevice *vdev = container_of(bar, VFIOPCIDevice, bars[bar->nr]);

         DPRINTF("%s(%04x:%02x:%02x.%x:BAR%d+0x%"HWADDR_PRIx

                 ", %d) = 0x%"PRIx64"\n", __func__, vdev->host.domain,

@@ -1166,7 +1166,7 @@ static uint64_t vfio_bar_read(void *opaque,

 #endif

     /* Same as write above */

-    vfio_eoi(container_of(bar, VFIODevice, bars[bar->nr]));

+    vfio_eoi(container_of(bar, VFIOPCIDevice, bars[bar->nr]));

     return data;

 }

@@ -1177,7 +1177,7 @@ static const MemoryRegionOps vfio_bar_ops = {

     .endianness = DEVICE_LITTLE_ENDIAN,

 };

-static void vfio_pci_load_rom(VFIODevice *vdev)

+static void vfio_pci_load_rom(VFIOPCIDevice *vdev)

 {

     struct vfio_region_info reg_info = {

         .argsz = sizeof(reg_info),

@@ -1235,7 +1235,7 @@ static void vfio_pci_load_rom(VFIODevice *vdev)

 static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)

 {

-    VFIODevice *vdev = opaque;

+    VFIOPCIDevice *vdev = opaque;

     uint64_t val = ((uint64_t)1 << (size * 8)) - 1;

     /* Load the ROM lazily when the guest tries to read it */

@@ -1264,7 +1264,7 @@ static const MemoryRegionOps vfio_rom_ops = {

     .endianness = DEVICE_LITTLE_ENDIAN,

 };

-static bool vfio_blacklist_opt_rom(VFIODevice *vdev)

+static bool vfio_blacklist_opt_rom(VFIOPCIDevice *vdev)

 {

     PCIDevice *pdev = &vdev->pdev;

     uint16_t vendor_id, device_id;

@@ -1284,7 +1284,7 @@ static bool vfio_blacklist_opt_rom(VFIODevice *vdev)

     return false;

 }

-static void vfio_pci_size_rom(VFIODevice *vdev)

+static void vfio_pci_size_rom(VFIOPCIDevice *vdev)

 {

     uint32_t orig, size = cpu_to_le32((uint32_t)PCI_ROM_ADDRESS_MASK);

     off_t offset = vdev->config_offset + PCI_ROM_ADDRESS;

@@ -1463,7 +1463,7 @@ static uint64_t vfio_generic_window_quirk_read(void *opaque,

                                                hwaddr addr, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     uint64_t data;

     if (vfio_flags_enabled(quirk->data.flags, quirk->data.read_flags) &&

@@ -1496,7 +1496,7 @@ static void vfio_generic_window_quirk_write(void *opaque, hwaddr addr,

                                             uint64_t data, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     if (ranges_overlap(addr, size,

                        quirk->data.address_offset, quirk->data.address_size)) {

@@ -1550,7 +1550,7 @@ static uint64_t vfio_generic_quirk_read(void *opaque,

                                         hwaddr addr, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     hwaddr base = quirk->data.address_match & TARGET_PAGE_MASK;

     hwaddr offset = quirk->data.address_match & ~TARGET_PAGE_MASK;

     uint64_t data;

@@ -1580,7 +1580,7 @@ static void vfio_generic_quirk_write(void *opaque, hwaddr addr,

                                      uint64_t data, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     hwaddr base = quirk->data.address_match & TARGET_PAGE_MASK;

     hwaddr offset = quirk->data.address_match & ~TARGET_PAGE_MASK;

@@ -1625,7 +1625,7 @@ static uint64_t vfio_ati_3c3_quirk_read(void *opaque,

                                         hwaddr addr, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     uint64_t data = vfio_pci_read_config(&vdev->pdev,

                                          PCI_BASE_ADDRESS_0 + (4 * 4) + 1,

                                          size);

@@ -1639,7 +1639,7 @@ static const MemoryRegionOps vfio_ati_3c3_quirk = {

     .endianness = DEVICE_LITTLE_ENDIAN,

 };

-static void vfio_vga_probe_ati_3c3_quirk(VFIODevice *vdev)

+static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -1682,7 +1682,7 @@ static void vfio_vga_probe_ati_3c3_quirk(VFIODevice *vdev)

  * that only read-only access is provided, but we drop writes when the window

  * is enabled to config space nonetheless.

  */

-static void vfio_probe_ati_bar4_window_quirk(VFIODevice *vdev, int nr)

+static void vfio_probe_ati_bar4_window_quirk(VFIOPCIDevice *vdev, int nr)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -1718,7 +1718,7 @@ static void vfio_probe_ati_bar4_window_quirk(VFIODevice *vdev, int nr)

 /*

  * Trap the BAR2 MMIO window to config space as well.

  */

-static void vfio_probe_ati_bar2_4000_quirk(VFIODevice *vdev, int nr)

+static void vfio_probe_ati_bar2_4000_quirk(VFIOPCIDevice *vdev, int nr)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -1786,7 +1786,7 @@ static uint64_t vfio_nvidia_3d0_quirk_read(void *opaque,

                                            hwaddr addr, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     PCIDevice *pdev = &vdev->pdev;

     uint64_t data = vfio_vga_read(&vdev->vga.region[QEMU_PCI_VGA_IO_HI],

                                   addr + quirk->data.base_offset, size);

@@ -1805,7 +1805,7 @@ static void vfio_nvidia_3d0_quirk_write(void *opaque, hwaddr addr,

                                         uint64_t data, unsigned size)

 {

     VFIOQuirk *quirk = opaque;

-    VFIODevice *vdev = quirk->vdev;

+    VFIOPCIDevice *vdev = quirk->vdev;

     PCIDevice *pdev = &vdev->pdev;

     switch (quirk->data.flags) {

@@ -1852,7 +1852,7 @@ static const MemoryRegionOps vfio_nvidia_3d0_quirk = {

     .endianness = DEVICE_LITTLE_ENDIAN,

 };

-static void vfio_vga_probe_nvidia_3d0_quirk(VFIODevice *vdev)

+static void vfio_vga_probe_nvidia_3d0_quirk(VFIOPCIDevice *vdev)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -1944,7 +1944,7 @@ static const MemoryRegionOps vfio_nvidia_bar5_window_quirk = {

     .endianness = DEVICE_LITTLE_ENDIAN,

 };

-static void vfio_probe_nvidia_bar5_window_quirk(VFIODevice *vdev, int nr)

+static void vfio_probe_nvidia_bar5_window_quirk(VFIOPCIDevice *vdev, int nr)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -1984,7 +1984,7 @@ static void vfio_probe_nvidia_bar5_window_quirk(VFIODevice *vdev, int nr)

  *

  * Here's offset 0x88000...

  */

-static void vfio_probe_nvidia_bar0_88000_quirk(VFIODevice *vdev, int nr)

+static void vfio_probe_nvidia_bar0_88000_quirk(VFIOPCIDevice *vdev, int nr)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -2018,7 +2018,7 @@ static void vfio_probe_nvidia_bar0_88000_quirk(VFIODevice *vdev, int nr)

 /*

  * And here's the same for BAR0 offset 0x1800...

  */

-static void vfio_probe_nvidia_bar0_1800_quirk(VFIODevice *vdev, int nr)

+static void vfio_probe_nvidia_bar0_1800_quirk(VFIOPCIDevice *vdev, int nr)

 {

     PCIDevice *pdev = &vdev->pdev;

     VFIOQuirk *quirk;

@@ -2062,13 +2062,13 @@ static void vfio_probe_nvidia_bar0_1800_quirk(VFIODevice *vdev, int nr)

 /*

  * Common quirk probe entry points.

  */

-static void vfio_vga_quirk_setup(VFIODevice *vdev)

+static void vfio_vga_quirk_setup(VFIOPCIDevice *vdev)

 {

     vfio_vga_probe_ati_3c3_quirk(vdev);

     vfio_vga_probe_nvidia_3d0_quirk(vdev);

 }

-static void vfio_vga_quirk_teardown(VFIODevice *vdev)

+static void vfio_vga_quirk_teardown(VFIOPCIDevice *vdev)

 {

     int i;

@@ -2083,7 +2083,7 @@ static void vfio_vga_quirk_teardown(VFIODevice *vdev)

     }

 }

-static void vfio_bar_quirk_setup(VFIODevice *vdev, int nr)

+static void vfio_bar_quirk_setup(VFIOPCIDevice *vdev, int nr)

 {

     vfio_probe_ati_bar4_window_quirk(vdev, nr);

     vfio_probe_ati_bar2_4000_quirk(vdev, nr);

@@ -2092,7 +2092,7 @@ static void vfio_bar_quirk_setup(VFIODevice *vdev, int nr)

     vfio_probe_nvidia_bar0_1800_quirk(vdev, nr);

 }

-static void vfio_bar_quirk_teardown(VFIODevice *vdev, int nr)

+static void vfio_bar_quirk_teardown(VFIOPCIDevice *vdev, int nr)

 {

     VFIOBAR *bar = &vdev->bars[nr];

@@ -2110,7 +2110,7 @@ static void vfio_bar_quirk_teardown(VFIODevice *vdev, int nr)

  */

 static uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)

 {

-    VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev);

+    VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val;

     memcpy(&emu_bits, vdev->emulated_config_bits + addr, len);

@@ -2145,7 +2145,7 @@ static uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)

 static void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr,

                                   uint32_t val, int len)

 {

-    VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev);

+    VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     uint32_t val_le = cpu_to_le32(val);

     DPRINTF("%s(%04x:%02x:%02x.%x, @0x%x, 0x%x, len=0x%x)\n", __func__,

@@ -2365,7 +2365,7 @@ static void vfio_listener_release(VFIOContainer *container)

 /*

  * Interrupt setup

  */

-static void vfio_disable_interrupts(VFIODevice *vdev)

+static void vfio_disable_interrupts(VFIOPCIDevice *vdev)

 {

     /*

      * More complicated than it looks.  Disabling MSI/X transitions the

@@ -2383,7 +2383,7 @@ static void vfio_disable_interrupts(VFIODevice *vdev)

     }

 }

-static int vfio_setup_msi(VFIODevice *vdev, int pos)

+static int vfio_setup_msi(VFIOPCIDevice *vdev, int pos)

 {

     uint16_t ctrl;

     bool msi_64bit, msi_maskbit;

@@ -2423,7 +2423,7 @@ static int vfio_setup_msi(VFIODevice *vdev, int pos)

  * need to first look for where the MSI-X table lives.  So we

  * unfortunately split MSI-X setup across two functions.

  */

-static int vfio_early_setup_msix(VFIODevice *vdev)

+static int vfio_early_setup_msix(VFIOPCIDevice *vdev)

 {

     uint8_t pos;

     uint16_t ctrl;

@@ -2496,7 +2496,7 @@ static int vfio_early_setup_msix(VFIODevice *vdev)

     return 0;

 }

-static int vfio_setup_msix(VFIODevice *vdev, int pos)

+static int vfio_setup_msix(VFIOPCIDevice *vdev, int pos)

 {

     int ret;

@@ -2516,7 +2516,7 @@ static int vfio_setup_msix(VFIODevice *vdev, int pos)

     return 0;

 }

-static void vfio_teardown_msi(VFIODevice *vdev)

+static void vfio_teardown_msi(VFIOPCIDevice *vdev)

 {

     msi_uninit(&vdev->pdev);

@@ -2529,7 +2529,7 @@ static void vfio_teardown_msi(VFIODevice *vdev)

 /*

  * Resource setup

  */

-static void vfio_mmap_set_enabled(VFIODevice *vdev, bool enabled)

+static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled)

 {

     int i;

@@ -2547,7 +2547,7 @@ static void vfio_mmap_set_enabled(VFIODevice *vdev, bool enabled)

     }

 }

-static void vfio_unmap_bar(VFIODevice *vdev, int nr)

+static void vfio_unmap_bar(VFIOPCIDevice *vdev, int nr)

 {

     VFIOBAR *bar = &vdev->bars[nr];

@@ -2570,7 +2570,7 @@ static void vfio_unmap_bar(VFIODevice *vdev, int nr)

     memory_region_destroy(&bar->mem);

 }

-static int vfio_mmap_bar(VFIODevice *vdev, VFIOBAR *bar,

+static int vfio_mmap_bar(VFIOPCIDevice *vdev, VFIOBAR *bar,

                          MemoryRegion *mem, MemoryRegion *submem,

                          void **map, size_t size, off_t offset,

                          const char *name)

@@ -2609,7 +2609,7 @@ empty_region:

     return ret;

 }

-static void vfio_map_bar(VFIODevice *vdev, int nr)

+static void vfio_map_bar(VFIOPCIDevice *vdev, int nr)

 {

     VFIOBAR *bar = &vdev->bars[nr];

     uint64_t size = bar->size;

@@ -2678,7 +2678,7 @@ static void vfio_map_bar(VFIODevice *vdev, int nr)

     vfio_bar_quirk_setup(vdev, nr);

 }

-static void vfio_map_bars(VFIODevice *vdev)

+static void vfio_map_bars(VFIOPCIDevice *vdev)

 {

     int i;

@@ -2710,7 +2710,7 @@ static void vfio_map_bars(VFIODevice *vdev)

     }

 }

-static void vfio_unmap_bars(VFIODevice *vdev)

+static void vfio_unmap_bars(VFIOPCIDevice *vdev)

 {

     int i;

@@ -2749,7 +2749,7 @@ static void vfio_set_word_bits(uint8_t *buf, uint16_t val, uint16_t mask)

     pci_set_word(buf, (pci_get_word(buf) & ~mask) | val);

 }

-static void vfio_add_emulated_word(VFIODevice *vdev, int pos,

+static void vfio_add_emulated_word(VFIOPCIDevice *vdev, int pos,

                                    uint16_t val, uint16_t mask)

 {

     vfio_set_word_bits(vdev->pdev.config + pos, val, mask);

@@ -2762,7 +2762,7 @@ static void vfio_set_long_bits(uint8_t *buf, uint32_t val, uint32_t mask)

     pci_set_long(buf, (pci_get_long(buf) & ~mask) | val);

 }

-static void vfio_add_emulated_long(VFIODevice *vdev, int pos,

+static void vfio_add_emulated_long(VFIOPCIDevice *vdev, int pos,

                                    uint32_t val, uint32_t mask)

 {

     vfio_set_long_bits(vdev->pdev.config + pos, val, mask);

@@ -2770,7 +2770,7 @@ static void vfio_add_emulated_long(VFIODevice *vdev, int pos,

     vfio_set_long_bits(vdev->emulated_config_bits + pos, mask, mask);

 }

-static int vfio_setup_pcie_cap(VFIODevice *vdev, int pos, uint8_t size)

+static int vfio_setup_pcie_cap(VFIOPCIDevice *vdev, int pos, uint8_t size)

 {

     uint16_t flags;

     uint8_t type;

@@ -2862,7 +2862,7 @@ static int vfio_setup_pcie_cap(VFIODevice *vdev, int pos, uint8_t size)

     return pos;

 }

-static void vfio_check_pcie_flr(VFIODevice *vdev, uint8_t pos)

+static void vfio_check_pcie_flr(VFIOPCIDevice *vdev, uint8_t pos)

 {

     uint32_t cap = pci_get_long(vdev->pdev.config + pos + PCI_EXP_DEVCAP);

@@ -2874,7 +2874,7 @@ static void vfio_check_pcie_flr(VFIODevice *vdev, uint8_t pos)

     }

 }

-static void vfio_check_pm_reset(VFIODevice *vdev, uint8_t pos)

+static void vfio_check_pm_reset(VFIOPCIDevice *vdev, uint8_t pos)

 {

     uint16_t csr = pci_get_word(vdev->pdev.config + pos + PCI_PM_CTRL);

@@ -2886,7 +2886,7 @@ static void vfio_check_pm_reset(VFIODevice *vdev, uint8_t pos)

     }

 }

-static void vfio_check_af_flr(VFIODevice *vdev, uint8_t pos)

+static void vfio_check_af_flr(VFIOPCIDevice *vdev, uint8_t pos)

 {

     uint8_t cap = pci_get_byte(vdev->pdev.config + pos + PCI_AF_CAP);

@@ -2898,7 +2898,7 @@ static void vfio_check_af_flr(VFIODevice *vdev, uint8_t pos)

     }

 }

-static int vfio_add_std_cap(VFIODevice *vdev, uint8_t pos)

+static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)

 {

     PCIDevice *pdev = &vdev->pdev;

     uint8_t cap_id, next, size;

@@ -2973,7 +2973,7 @@ static int vfio_add_std_cap(VFIODevice *vdev, uint8_t pos)

     return 0;

 }

-static int vfio_add_capabilities(VFIODevice *vdev)

+static int vfio_add_capabilities(VFIOPCIDevice *vdev)

 {

     PCIDevice *pdev = &vdev->pdev;

@@ -2985,7 +2985,7 @@ static int vfio_add_capabilities(VFIODevice *vdev)

     return vfio_add_std_cap(vdev, pdev->config[PCI_CAPABILITY_LIST]);

 }

-static void vfio_pci_pre_reset(VFIODevice *vdev)

+static void vfio_pci_pre_reset(VFIOPCIDevice *vdev)

 {

     PCIDevice *pdev = &vdev->pdev;

     uint16_t cmd;