From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cICUi-0007w0-24 for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cICUh-0008F9-1r for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:36 -0500 Received: from mga05.intel.com ([192.55.52.43]:21540) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cICUg-0007ss-Ot for qemu-devel@nongnu.org; Sat, 17 Dec 2016 05:45:34 -0500 From: Wei Wang Date: Sat, 17 Dec 2016 18:43:31 +0800 Message-Id: <1481971427-11094-22-git-send-email-wei.w.wang@intel.com> In-Reply-To: <1481971427-11094-1-git-send-email-wei.w.wang@intel.com> References: <1481971427-11094-1-git-send-email-wei.w.wang@intel.com> Subject: [Qemu-devel] [PATCH v1 21/37] vhost-pci-slave/msg: VHOST_USER_SET_VRING_CALL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@gmail.com, mst@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org Cc: Wei Wang Update the callfd to the head node in the list. This version of vhost-pci expects the master device to use polling to receive packets, so callfd is recorded here for tomorrow's implementation. Signed-off-by: Wei Wang --- hw/virtio/vhost-pci-slave.c | 18 ++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 1 + 2 files changed, 19 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index dff1c88..e176d59 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -231,6 +231,13 @@ static void vp_slave_set_vring_kick(int fd) pvq_node->kickfd = fd; } +static void vp_slave_set_vring_call(int fd) +{ + PeerVqNode *pvq_node = QLIST_FIRST(&vp_slave->pvq_list); + if (pvq_node) + pvq_node->callfd = fd; +} + static int vp_slave_can_read(void *opaque) { return VHOST_USER_HDR_SIZE; @@ -314,6 +321,17 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) */ qemu_set_nonblock(fds[0]); break; + case VHOST_USER_SET_VRING_CALL: + /* consume the fd */ + qemu_chr_fe_get_msgfds(chr_be, fds, 1); + vp_slave_set_vring_call(fds[0]); + /* + * This is a non-blocking eventfd. + * The receive function forces it to be blocking, + * so revert it back to non-blocking. + */ + qemu_set_nonblock(fds[0]); + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index 4b6b213..f6206a1 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -11,6 +11,7 @@ typedef struct PeerVqNode { uint16_t last_avail_idx; uint32_t vring_num; int kickfd; + int callfd; struct vhost_vring_addr addr; QLIST_ENTRY(PeerVqNode) node; } PeerVqNode; -- 2.7.4