From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9r4f-0001dc-QL 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-0000hE-C4 for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9r4b-0000gi-6l for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:21 -0400 From: Gerd Hoffmann Date: Tue, 30 Jun 2015 10:39:03 +0200 Message-Id: <1435653553-7728-13-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 12/22] virtio: add version 1.0 support to vp_{get, set}_status 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 | 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 80b6fcc..29d0295 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 abb603f..f4e0c7d 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