1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index 2b1e70db44a0..610c43f19230 100644
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -53,12 +53,29 @@ struct virtio_pci_device {
         struct virtio_device vdev;
         struct pci_dev *pci_dev;
 
+        /* In legacy mode, these two point to within ->legacy. */
+        /* Where to read and clear interrupt */
+        u8 __iomem *isr;
+
+        /* Modern only fields */
+        /* The IO mapping for the PCI config space (non-legacy mode) */
+        struct virtio_pci_common_cfg __iomem *common;
+        /* Device-specific data (non-legacy mode)  */
+        void __iomem *device;
+
+        /* So we can sanity-check accesses. */
+        size_t device_len;
+
+        /* Capability for when we need to map notifications per-vq. */
+        int notify_map_cap;
+
+        /* Multiply queue_notify_off by this value. (non-legacy mode). */
+        u32 notify_offset_multiplier;
+
+        /* Legacy only field */
         /* the IO mapping for the PCI config space */
         void __iomem *ioaddr;
 
-        /* the IO mapping for ISR operation */
-        void __iomem *isr;
-
         /* a list of queues so we can dispatch IRQs */
         spinlock_t lock;
         struct list_head virtqueues;
@@ -129,5 +146,7 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu);
 
 int virtio_pci_legacy_probe(struct virtio_pci_device *);
 void virtio_pci_legacy_remove(struct virtio_pci_device *);
+int virtio_pci_modern_probe(struct virtio_pci_device *);
+void virtio_pci_modern_remove(struct virtio_pci_device *);
 
 #endif