[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/18] virtio: add version 1.0 support to vp_reset
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/18] virtio: add version 1.0 support to vp_reset |
Date: |
Mon, 29 Jun 2015 10:53:33 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
src/hw/virtio-pci.c | 16 ++++++++++++++++
src/hw/virtio-pci.h | 9 +--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c
index 481b365..d2d06c5 100644
--- a/src/hw/virtio-pci.c
+++ b/src/hw/virtio-pci.c
@@ -102,6 +102,22 @@ u8 vp_get_isr(struct vp_device *vp)
return isr;
}
+void vp_reset(struct vp_device *vp)
+{
+ u8 isr;
+
+ if (vp->use_modern) {
+ vp_modern_write(vp->common, virtio_pci_common_cfg,
+ device_status, 0);
+ vp_modern_read(vp->isr, virtio_pci_isr,
+ isr, isr);
+ } else {
+ outb(0, vp->ioaddr + VIRTIO_PCI_STATUS);
+ isr = inb(vp->ioaddr + VIRTIO_PCI_ISR);
+ }
+ (void)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 c9e5a21..608f492 100644
--- a/src/hw/virtio-pci.h
+++ b/src/hw/virtio-pci.h
@@ -205,14 +205,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 11/18] virtio: add version 1.0 support to vp_reset,
Gerd Hoffmann <=
[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
[Qemu-devel] [PATCH 17/18] virtio: use version 1.0 if available (flip the big switch), Gerd Hoffmann, 2015/06/29
[Qemu-devel] [PATCH 18/18] virtio: also probe version 1.0 pci ids, Gerd Hoffmann, 2015/06/29
Re: [Qemu-devel] [SeaBIOS] [PATCH 00/18] virtio: add version 1.0 support, Kevin O'Connor, 2015/06/29