From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9r4g-0001de-IO for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9r4b-0000hf-MF for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9r4b-0000hI-Gd for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:21 -0400 From: Gerd Hoffmann Date: Tue, 30 Jun 2015 10:39:04 +0200 Message-Id: <1435653553-7728-14-git-send-email-kraxel@redhat.com> In-Reply-To: <1435653553-7728-1-git-send-email-kraxel@redhat.com> References: <1435653553-7728-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 13/22] virtio: add version 1.0 support to vp_get_isr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: seabios@seabios.org Cc: Gerd Hoffmann , qemu-devel@nongnu.org, "Michael S. Tsirkin" Signed-off-by: Gerd Hoffmann --- src/hw/virtio-pci.c | 9 +++++++++ src/hw/virtio-pci.h | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c index 29d0295..b66326a 100644 --- a/src/hw/virtio-pci.c +++ b/src/hw/virtio-pci.c @@ -77,6 +77,15 @@ void vp_set_status(struct vp_device *vp, u8 status) } } +u8 vp_get_isr(struct vp_device *vp) +{ + if (vp->use_modern) { + return vp_read(&vp->isr, virtio_pci_isr, isr); + } else { + return 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 f4e0c7d..470a53f 100644 --- a/src/hw/virtio-pci.h +++ b/src/hw/virtio-pci.h @@ -230,11 +230,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