[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/25] virtio: add version 1.0 support to vp_{get
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v3 11/25] virtio: add version 1.0 support to vp_{get, set}_status |
Date: |
Wed, 1 Jul 2015 16:40:56 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
src/hw/virtio-pci.c | 20 ++++++++++++++++++++
src/hw/virtio-pci.h | 13 ++-----------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c
index 5ae6a76..c9c79b3 100644
--- a/src/hw/virtio-pci.c
+++ b/src/hw/virtio-pci.c
@@ -57,6 +57,26 @@ void vp_set_features(struct vp_device *vp, u64 features)
}
}
+u8 vp_get_status(struct vp_device *vp)
+{
+ if (vp->use_modern) {
+ return vp_read(&vp->common, virtio_pci_common_cfg, device_status);
+ } else {
+ return vp_read(&vp->legacy, virtio_pci_legacy, status);
+ }
+}
+
+void vp_set_status(struct vp_device *vp, u8 status)
+{
+ if (status == 0) /* reset */
+ return;
+ if (vp->use_modern) {
+ vp_write(&vp->common, virtio_pci_common_cfg, device_status, status);
+ } else {
+ vp_write(&vp->legacy, virtio_pci_legacy, status, 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 962d6c0..e3f6f99 100644
--- a/src/hw/virtio-pci.h
+++ b/src/hw/virtio-pci.h
@@ -228,17 +228,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 v3 06/25] virtio: add version 0.9.5 struct, (continued)
- [Qemu-devel] [PATCH v3 06/25] virtio: add version 0.9.5 struct, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 08/25] virtio: create vp_cap struct for legacy bar, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 02/25] virtio: run drivers in 32bit mode, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 10/25] virtio: make features 64bit, support version 1.0 features, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 03/25] virtio: add struct vp_device, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 09/25] virtio: add read/write functions and macros, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 05/25] virtio: add version 1.0 structs and #defines, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 15/25] virtio: remove unused vp_del_vq, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 19/25] virtio: use version 1.0 if available (flip the big switch), Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 12/25] virtio: add version 1.0 support to vp_get_isr, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 11/25] virtio: add version 1.0 support to vp_{get, set}_status,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v3 23/25] virtio-scsi: 32bit cleanup, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 13/25] virtio: add version 1.0 support to vp_reset, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 07/25] virtio: find version 1.0 virtio capabilities, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 21/25] virtio: legacy cleanup, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 22/25] virtio-blk: 32bit cleanup, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 24/25] virtio-ring: 32bit cleanup, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 20/25] virtio: also probe version 1.0 pci ids, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 17/25] virtio-scsi: fix initialization for version 1.0, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 16/25] virtio: add version 1.0 support to vp_find_vq, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 18/25] virtio-blk: fix initialization for version 1.0, Gerd Hoffmann, 2015/07/01