From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SleJn-0000Xu-8K for qemu-devel@nongnu.org; Mon, 02 Jul 2012 06:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SleJf-0000ZD-A9 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 06:57:22 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:51885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SleJf-0000Yd-1l for qemu-devel@nongnu.org; Mon, 02 Jul 2012 06:57:15 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Jul 2012 11:57:11 +0100 Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q62Auvk42654446 for ; Mon, 2 Jul 2012 11:56:57 +0100 Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q62Auvqo020567 for ; Mon, 2 Jul 2012 04:56:57 -0600 From: Stefan Hajnoczi Date: Mon, 2 Jul 2012 11:56:50 +0100 Message-Id: <1341226613-15577-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1341226613-15577-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1341226613-15577-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/4] net: add public qemu_net_poll() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , lersek@redhat.com, Stefan Hajnoczi The NetClientInfo .poll() callback is being called directly by hw/vhost_net.c. Create a public net.c function so callers do not depend on internals. This change is useful because later patches change net internals. Those changes shouldn't affect .poll() callers. Signed-off-by: Stefan Hajnoczi --- hw/vhost_net.c | 6 +++--- net.c | 7 +++++++ net.h | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/vhost_net.c b/hw/vhost_net.c index c2d90df..ac3e616 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -160,7 +160,7 @@ int vhost_net_start(struct vhost_net *net, goto fail_start; } - net->nc->info->poll(net->nc, false); + qemu_net_poll(net->nc, false); qemu_set_fd_handler(net->backend, NULL, NULL, NULL); file.fd = net->backend; for (file.index = 0; file.index < net->dev.nvqs; ++file.index) { @@ -177,7 +177,7 @@ fail: int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file); assert(r >= 0); } - net->nc->info->poll(net->nc, true); + qemu_net_poll(net->nc, true); vhost_dev_stop(&net->dev, dev); if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr)); @@ -197,7 +197,7 @@ void vhost_net_stop(struct vhost_net *net, int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file); assert(r >= 0); } - net->nc->info->poll(net->nc, true); + qemu_net_poll(net->nc, true); vhost_dev_stop(&net->dev, dev); if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr)); diff --git a/net.c b/net.c index 6bbc9fc..5e4957f 100644 --- a/net.c +++ b/net.c @@ -450,6 +450,13 @@ qemu_sendv_packet(NetClientState *nc, const struct iovec *iov, int iovcnt) return qemu_sendv_packet_async(nc, iov, iovcnt, NULL); } +void qemu_net_poll(NetClientState *nc, bool enable) +{ + if (nc->info->poll) { + nc->info->poll(nc, enable); + } +} + NetClientState *qemu_find_netdev(const char *id) { NetClientState *nc; diff --git a/net.h b/net.h index 0256ff9..64d5d0e 100644 --- a/net.h +++ b/net.h @@ -124,6 +124,8 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender, int iovcnt, void *opaque); +void qemu_net_poll(NetClientState *nc, bool enable); + void print_net_client(Monitor *mon, NetClientState *vc); void do_info_network(Monitor *mon); -- 1.7.10