[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/18] virtio: add version 1.0 support to vp_{get, s
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/18] virtio: add version 1.0 support to vp_{get, set}_status |
Date: |
Mon, 29 Jun 2015 10:53:31 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
src/hw/virtio-pci.c | 25 +++++++++++++++++++++++++
src/hw/virtio-pci.h | 13 ++-----------
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c
index 68f1ded..b414c71 100644
--- a/src/hw/virtio-pci.c
+++ b/src/hw/virtio-pci.c
@@ -65,6 +65,31 @@ void vp_set_features(struct vp_device *vp, u64 features)
}
}
+u8 vp_get_status(struct vp_device *vp)
+{
+ u8 status;
+
+ if (vp->use_modern) {
+ vp_modern_read(vp->common, virtio_pci_common_cfg,
+ device_status, status);
+ } else {
+ status = inb(vp->ioaddr + VIRTIO_PCI_STATUS);
+ }
+ return status;
+}
+
+void vp_set_status(struct vp_device *vp, u8 status)
+{
+ if (status == 0) /* reset */
+ return;
+ if (vp->use_modern) {
+ vp_modern_write(vp->common, virtio_pci_common_cfg,
+ device_status, status);
+ } else {
+ outb(status, vp->ioaddr + VIRTIO_PCI_STATUS);
+ }
+}
+
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 e275703..079aa53 100644
--- a/src/hw/virtio-pci.h
+++ b/src/hw/virtio-pci.h
@@ -202,17 +202,8 @@ static inline void vp_get(struct vp_device *vp, unsigned
offset,
ptr[i] = inb(ioaddr + VIRTIO_PCI_CONFIG + offset + i);
}
-static inline u8 vp_get_status(struct vp_device *vp)
-{
- return inb(GET_LOWFLAT(vp->ioaddr) + VIRTIO_PCI_STATUS);
-}
-
-static inline void vp_set_status(struct vp_device *vp, u8 status)
-{
- if (status == 0) /* reset */
- return;
- outb(status, GET_LOWFLAT(vp->ioaddr) + VIRTIO_PCI_STATUS);
-}
+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)
{
--
1.8.3.1
[Qemu-devel] [PATCH 11/18] virtio: add version 1.0 support to vp_reset, Gerd Hoffmann, 2015/06/29
[Qemu-devel] [PATCH 13/18] virtio: remove unused vp_del_vq, Gerd Hoffmann, 2015/06/29
[Qemu-devel] [PATCH 12/18] virtio: add version 1.0 support to vp_notify, Gerd Hoffmann, 2015/06/29
[Qemu-devel] [PATCH 14/18] virtio: add version 1.0 support to vp_find_vq, Gerd Hoffmann, 2015/06/29
[Qemu-devel] [PATCH 15/18] virtio-scsi: fix initialization for version 1.0, Gerd Hoffmann, 2015/06/29
[Qemu-devel] [PATCH 16/18] virtio-blk: fix initialization for version 1.0, Gerd Hoffmann, 2015/06/29