From patchwork Wed Apr 17 08:39:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 237181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 17AEB2C015A for ; Wed, 17 Apr 2013 19:36:11 +1000 (EST) Received: from localhost ([::1]:40214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USNxj-0003UL-QQ for incoming@patchwork.ozlabs.org; Wed, 17 Apr 2013 04:43:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USNup-0000QY-Ah for qemu-devel@nongnu.org; Wed, 17 Apr 2013 04:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USNul-0003JF-3B for qemu-devel@nongnu.org; Wed, 17 Apr 2013 04:40:31 -0400 Received: from mail-da0-x22a.google.com ([2607:f8b0:400e:c00::22a]:56886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USNuk-0003Hy-TX for qemu-devel@nongnu.org; Wed, 17 Apr 2013 04:40:27 -0400 Received: by mail-da0-f42.google.com with SMTP id n15so219499dad.15 for ; Wed, 17 Apr 2013 01:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=88syvIQYqk/sMWZPB0JipSShcYB+sL33k1rM3hTLKns=; b=jAG2sBMKwujyUFrSL+JDc34aqeyOP9yS5KcLf8Az58qa21On1mAg0ovyYotk8ErCSD 6xEnKk/rdx9Y3xjyBY1faFGpJ+OsSj30yFtnoBnbxRwkF45UMeUutVzAzjWHH1TaWiFV 8WoYTv8ej1YmloJoAsu0nN5TkECEqKBnxR78C9dJHI+RJx0bUkqtjpZVORc6eqNhcWwZ m4SmiEAXQo8GBE/zlDa08vRrjQk7TBT6HMWc9HaT79yN5AuVUoyA9WiIzWE0u0vA0S+D jvJYVtAiR8l037F5PzKjJP7g0SYqPJPoOWjqnWUe+W5YhzFi5c1Pvo1654y1GTkz8HUQ 3XAw== X-Received: by 10.68.200.162 with SMTP id jt2mr7958069pbc.138.1366188023297; Wed, 17 Apr 2013 01:40:23 -0700 (PDT) Received: from localhost ([114.245.251.229]) by mx.google.com with ESMTPS id ak5sm6322937pac.4.2013.04.17.01.40.18 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 01:40:22 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 17 Apr 2013 16:39:14 +0800 Message-Id: <1366187964-14265-6-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1366187964-14265-1-git-send-email-qemulist@gmail.com> References: <1366187964-14265-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c00::22a Cc: mdroth , Paolo Bonzini , Stefan Hajnoczi , Anthony Liguori , Jan Kiszka Subject: [Qemu-devel] [RFC PATCH v4 05/15] net: port vde onto GSource X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan Signed-off-by: Liu Ping Fan --- net/vde.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/net/vde.c b/net/vde.c index 4dea32d..bb7016b 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,18 +62,36 @@ 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) { + 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 int net_vde_init(NetClientState *peer, const char *model, @@ -83,6 +103,7 @@ static int net_vde_init(NetClientState *peer, const char *model, VDECONN *vde; char *init_group = (char *)group; char *init_sock = (char *)sock; + EventGSource *nsrc; struct vde_open_args args = { .port = port, @@ -104,7 +125,10 @@ 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); + nsrc = event_source_new(vde_datafd(vde), vde_handler, s); + nsrc->gfd.events = G_IO_IN; + s->nsrc = nsrc; + nc->info->bind_ctx(nc, NULL); return 0; }