[Qemu-devel] [PATCH 10/18] virtio: add version 1.0 support to vp_get_isr

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 src/hw/virtio-pci.c | 12 ++++++++++++
 src/hw/virtio-pci.h |  6 +-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c
index b414c71..481b365 100644
--- a/src/hw/virtio-pci.c
+++ b/src/hw/virtio-pci.c
@@ -90,6 +90,18 @@ void vp_set_status(struct vp_device *vp, u8 status)
     }
 }
 
+u8 vp_get_isr(struct vp_device *vp)
+{
+    u8 isr;
+
+    if (vp->use_modern) {
+        vp_modern_read(vp->isr, virtio_pci_isr, isr, isr);
+    } else {
+        isr = inb(vp->ioaddr + VIRTIO_PCI_ISR);
+    }
+    return isr;
+}
+
 int vp_find_vq(struct vp_device *vp, int queue_index,
                struct vring_virtqueue **p_vq)
 {
diff --git a/src/hw/virtio-pci.h b/src/hw/virtio-pci.h
index 079aa53..c9e5a21 100644
--- a/src/hw/virtio-pci.h
+++ b/src/hw/virtio-pci.h
@@ -204,11 +204,7 @@ static inline void vp_get(struct vp_device *vp, unsigned 
offset,
 
 u8 vp_get_status(struct vp_device *vp);
 void vp_set_status(struct vp_device *vp, u8 status);
-
-static inline u8 vp_get_isr(struct vp_device *vp)
-{
-    return inb(GET_LOWFLAT(vp->ioaddr) + VIRTIO_PCI_ISR);
-}
+u8 vp_get_isr(struct vp_device *vp);
 
 static inline void vp_reset(struct vp_device *vp)
 {
-- 
1.8.3.1