From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nkist-0000W6-Qo for qemu-devel@nongnu.org; Thu, 25 Feb 2010 13:56:27 -0500 Received: from [199.232.76.173] (port=52800 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nkisr-0000Vx-GN for qemu-devel@nongnu.org; Thu, 25 Feb 2010 13:56:25 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nkisq-0007u9-9F for qemu-devel@nongnu.org; Thu, 25 Feb 2010 13:56:25 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:57417) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nkisn-0007sV-GE for qemu-devel@nongnu.org; Thu, 25 Feb 2010 13:56:24 -0500 Received: by pwi4 with SMTP id 4so5254761pwi.4 for ; Thu, 25 Feb 2010 10:55:37 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <19fc42bc126bcf69ef1fac10e6e8073e387148dd.1267122331.git.mst@redhat.com> References: <19fc42bc126bcf69ef1fac10e6e8073e387148dd.1267122331.git.mst@redhat.com> Date: Thu, 25 Feb 2010 20:49:59 +0200 Message-ID: Subject: Re: [Qemu-devel] [PATCHv2 05/12] virtio: add APIs for queue fields From: Blue Swirl Content-Type: text/plain; charset=UTF-8 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: amit.shah@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com On 2/25/10, Michael S. Tsirkin wrote: > vhost needs physical addresses for ring and other queue fields, > so add APIs for these. > > Signed-off-by: Michael S. Tsirkin > --- > hw/virtio.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ > hw/virtio.h | 10 +++++++++- > 2 files changed, 59 insertions(+), 1 deletions(-) > > diff --git a/hw/virtio.c b/hw/virtio.c > index 1f5e7be..b017d7b 100644 > --- a/hw/virtio.c > +++ b/hw/virtio.c > @@ -74,6 +74,11 @@ struct VirtQueue > uint16_t vector; > void (*handle_output)(VirtIODevice *vdev, VirtQueue *vq); > VirtIODevice *vdev; > +<<<<<<< HEAD > +======= > + EventNotifier guest_notifier; > + EventNotifier host_notifier; > +>>>>>>> 8afa4fd... virtio: add APIs for queue fields Bug. > }; > > /* virt queue functions */ > @@ -593,6 +598,12 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, > return &vdev->vq[i]; > } > > +void virtio_irq(VirtQueue *vq) > +{ > + vq->vdev->isr |= 0x01; > + virtio_notify_vector(vq->vdev, vq->vector); > +} > + > void virtio_notify(VirtIODevice *vdev, VirtQueue *vq) > { > /* Always notify when queue is empty (when feature acknowledge) */ > @@ -736,3 +747,42 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, > vdev->binding = binding; > vdev->binding_opaque = opaque; > } > + > +target_phys_addr_t virtio_queue_get_desc(VirtIODevice *vdev, int n) > +{ > + return vdev->vq[n].vring.desc; > +} > + > +target_phys_addr_t virtio_queue_get_avail(VirtIODevice *vdev, int n) > +{ > + return vdev->vq[n].vring.avail; > +} > + > +target_phys_addr_t virtio_queue_get_used(VirtIODevice *vdev, int n) > +{ > + return vdev->vq[n].vring.used; > +} > + > +uint16_t virtio_queue_last_avail_idx(VirtIODevice *vdev, int n) > +{ > + return vdev->vq[n].last_avail_idx; > +} > + > +void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx) > +{ > + vdev->vq[n].last_avail_idx = idx; > +} > + > +VirtQueue *virtio_queue(VirtIODevice *vdev, int n) > +{ > + return vdev->vq + n; > +} > + > +EventNotifier *virtio_queue_guest_notifier(VirtQueue *vq) > +{ > + return &vq->guest_notifier; > +} > +EventNotifier *virtio_queue_host_notifier(VirtQueue *vq) > +{ > + return &vq->host_notifier; > +} > diff --git a/hw/virtio.h b/hw/virtio.h > index af87889..2ebf2dd 100644 > --- a/hw/virtio.h > +++ b/hw/virtio.h > @@ -184,5 +184,13 @@ void virtio_net_exit(VirtIODevice *vdev); > DEFINE_PROP_BIT("indirect_desc", _state, _field, \ > VIRTIO_RING_F_INDIRECT_DESC, true) > > - > +target_phys_addr_t virtio_queue_get_desc(VirtIODevice *vdev, int n); > +target_phys_addr_t virtio_queue_get_avail(VirtIODevice *vdev, int n); > +target_phys_addr_t virtio_queue_get_used(VirtIODevice *vdev, int n); > +uint16_t virtio_queue_last_avail_idx(VirtIODevice *vdev, int n); > +void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx); > +VirtQueue *virtio_queue(VirtIODevice *vdev, int n); > +EventNotifier *virtio_queue_guest_notifier(VirtQueue *vq); > +EventNotifier *virtio_queue_host_notifier(VirtQueue *vq); > +void virtio_irq(VirtQueue *vq); > #endif > > -- > 1.7.0.18.g0d53a5 > > > >