[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/25] virtio: add version 1.0 support to vp_rese
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v3 13/25] virtio: add version 1.0 support to vp_reset |
Date: |
Wed, 1 Jul 2015 16:40:58 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
src/hw/virtio-pci.c | 11 +++++++++++
src/hw/virtio-pci.h | 9 +--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c
index 2f0bb40..bd51d8a 100644
--- a/src/hw/virtio-pci.c
+++ b/src/hw/virtio-pci.c
@@ -86,6 +86,17 @@ u8 vp_get_isr(struct vp_device *vp)
}
}
+void vp_reset(struct vp_device *vp)
+{
+ if (vp->use_modern) {
+ vp_write(&vp->common, virtio_pci_common_cfg, device_status, 0);
+ vp_read(&vp->isr, virtio_pci_isr, isr);
+ } else {
+ vp_write(&vp->legacy, virtio_pci_legacy, status, 0);
+ vp_read(&vp->legacy, virtio_pci_legacy, 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 c891b7c..f2ae5b9 100644
--- a/src/hw/virtio-pci.h
+++ b/src/hw/virtio-pci.h
@@ -231,14 +231,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);
u8 vp_get_isr(struct vp_device *vp);
-
-static inline void vp_reset(struct vp_device *vp)
-{
- int ioaddr = GET_LOWFLAT(vp->ioaddr);
-
- outb(0, ioaddr + VIRTIO_PCI_STATUS);
- (void)inb(ioaddr + VIRTIO_PCI_ISR);
-}
+void vp_reset(struct vp_device *vp);
static inline void vp_notify(struct vp_device *vp, int queue_index)
{
--
1.8.3.1
- [Qemu-devel] [PATCH v3 02/25] virtio: run drivers in 32bit mode, (continued)
- [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, 2015/07/01
- [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 <=
- [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
- [Qemu-devel] [PATCH v3 14/25] virtio: add version 1.0 support to vp_notify, Gerd Hoffmann, 2015/07/01
- [Qemu-devel] [PATCH v3 25/25] virtio-pci: use high memory for rings, Gerd Hoffmann, 2015/07/01