From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZal0-000255-Ba for qemu-devel@nongnu.org; Tue, 07 May 2013 01:48:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZaky-0007Wk-1J for qemu-devel@nongnu.org; Tue, 07 May 2013 01:48:10 -0400 Received: from mail-pb0-x22f.google.com ([2607:f8b0:400e:c01::22f]:47924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZakx-0007We-R9 for qemu-devel@nongnu.org; Tue, 07 May 2013 01:48:07 -0400 Received: by mail-pb0-f47.google.com with SMTP id uo1so149924pbc.20 for ; Mon, 06 May 2013 22:48:07 -0700 (PDT) From: Liu Ping Fan Date: Tue, 7 May 2013 13:46:51 +0800 Message-Id: <1367905622-21038-4-git-send-email-qemulist@gmail.com> In-Reply-To: <1367905622-21038-1-git-send-email-qemulist@gmail.com> References: <1367905622-21038-1-git-send-email-qemulist@gmail.com> Subject: [Qemu-devel] [PATCH v1 03/14] net: port vde onto GSource List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth , Jan Kiszka , Stefan Hajnoczi , Anthony Liguori , Paolo Bonzini From: Liu Ping Fan Signed-off-by: Liu Ping Fan --- net/vde.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/net/vde.c b/net/vde.c index 4dea32d..fe763dd 100644 --- a/net/vde.c +++ b/net/vde.c @@ -30,10 +30,12 @@ #include "qemu-common.h" #include "qemu/option.h" #include "qemu/main-loop.h" +#include "util/event_gsource.h" typedef struct VDEState { NetClientState nc; VDECONN *vde; + EventGSource *nsrc; } VDEState; static void vde_to_qemu(void *opaque) @@ -60,20 +62,43 @@ static ssize_t vde_receive(NetClientState *nc, const uint8_t *buf, size_t size) return ret; } +static gboolean vde_handler(gpointer data) +{ + EventGSource *nsrc = (EventGSource *)data; + + if (nsrc->gfd.revents & (G_IO_IN | G_IO_HUP | G_IO_ERR)) { + vde_to_qemu(nsrc->opaque); + } + return true; +} + static void vde_cleanup(NetClientState *nc) { VDEState *s = DO_UPCAST(VDEState, nc, nc); - qemu_set_fd_handler(vde_datafd(s->vde), NULL, NULL, NULL); + event_source_release(s->nsrc); vde_close(s->vde); } +static void vde_bind_ctx(NetClientState *nc, GMainContext *ctx) +{ + VDEState *s = DO_UPCAST(VDEState, nc, nc); + + g_source_attach(&s->nsrc->source, ctx); +} + static NetClientInfo net_vde_info = { .type = NET_CLIENT_OPTIONS_KIND_VDE, .size = sizeof(VDEState), .receive = vde_receive, .cleanup = vde_cleanup, + .bind_ctx = vde_bind_ctx, }; +static gushort readable(void *opaque) +{ + return G_IO_IN | G_IO_HUP | G_IO_ERR; +} + static int net_vde_init(NetClientState *peer, const char *model, const char *name, const char *sock, int port, const char *group, int mode) @@ -104,7 +129,9 @@ static int net_vde_init(NetClientState *peer, const char *model, s->vde = vde; - qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s); + s->nsrc = event_source_new(vde_datafd(vde), vde_handler, s); + s->nsrc->readable = readable; + nc->info->bind_ctx(nc, NULL); return 0; } -- 1.7.4.4