From patchwork Fri Apr 26 02:47:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 239629 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 DEE3C2C0114 for ; Fri, 26 Apr 2013 12:50:04 +1000 (EST) Received: from localhost ([::1]:46544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVYjb-0003ul-48 for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2013 22:50:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVYig-0003DZ-Lg for qemu-devel@nongnu.org; Thu, 25 Apr 2013 22:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVYif-0007tz-N8 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 22:49:06 -0400 Received: from mail-ob0-x236.google.com ([2607:f8b0:4003:c01::236]:44473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVYif-0007t6-EI for qemu-devel@nongnu.org; Thu, 25 Apr 2013 22:49:05 -0400 Received: by mail-ob0-f182.google.com with SMTP id dn14so3132463obc.27 for ; Thu, 25 Apr 2013 19:49:04 -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=pdmRGcfLVulOi8q9Q7LasHmBOyDRxWmr1e1lZe05Lf8=; b=aWS57gZqpRtpK80fJiYGI4ZQNdTtjSJlMbWOpCloWfUipjzTFAKkFQfEs5G7qe7maE VRZv7EPDRFVyk7gLAsGc0763vxYiDRk2qIWD8Qk+jphDNRuGFQ2GmUKTIS1Ibsrlkjal MQtwlcBTwHLuZbrGGOTF9AnpfkF3HnWXXsjsGUtT2Ktwq11KixPtAZczJTvkEBtlHpfc d6SCSu8q+miNeNJEHzrjDwY09ArjWDXOrBbFVSxcWsaHMLN6BeH0EeR2R9VWhfZ2owe7 UaTuKPNeqWWUkdyw1wAWs3Y81jY8xc+aYisREcKoiEtgk2ae2KSIep/byvclYkj2KSVs GOEQ== X-Received: by 10.60.29.37 with SMTP id g5mr17228080oeh.140.1366944544849; Thu, 25 Apr 2013 19:49:04 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id rn6sm2924069oeb.0.2013.04.25.19.49.00 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 25 Apr 2013 19:49:03 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2013 10:47:27 +0800 Message-Id: <1366944455-14239-7-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1366944455-14239-1-git-send-email-qemulist@gmail.com> References: <1366944455-14239-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:4003:c01::236 Cc: mdroth , Jan Kiszka , Stefan Hajnoczi , Anthony Liguori , Paolo Bonzini Subject: [Qemu-devel] [RFC PATCH v5 06/14] net: port tap-win32 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/tap-win32.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index 91e9e84..7a84195 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -635,13 +635,14 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle, typedef struct TAPState { NetClientState nc; tap_win32_overlapped_t *handle; + EventGSource *nsrc; } TAPState; static void tap_cleanup(NetClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); - qemu_del_wait_object(s->handle->tap_semaphore, NULL, NULL); + event_source_release(s->nsrc); /* FIXME: need to kill thread and close file handle: tap_win32_close(s); @@ -669,13 +670,37 @@ static void tap_win32_send(void *opaque) } } +static void tap_bind_ctx(NetClientState *nc, GMainContext *ctx) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + + g_source_attach(&s->nsrc->source, ctx); +} + static NetClientInfo net_tap_win32_info = { .type = NET_CLIENT_OPTIONS_KIND_TAP, .size = sizeof(TAPState), .receive = tap_receive, .cleanup = tap_cleanup, + .bind_ctx = tap_bind_ctx, }; +static gboolean tap_win32_handler(gpointer data) +{ + EventGSource *nsrc = data; + TAPState *s = nsrc->opaque; + + if (nsrc->gfd.revents & G_IO_IN) { + tap_win32_send(s); + } + return true; +} + +static gushort readable(void *opaque) +{ + return G_IO_IN; +} + static int tap_win32_init(NetClientState *peer, const char *model, const char *name, const char *ifname) { @@ -697,7 +722,9 @@ static int tap_win32_init(NetClientState *peer, const char *model, s->handle = handle; - qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s); + s->nsrc = event_source_new(s->handle->tap_semaphore, tap_win32_handler, s); + s->nsrc->readable = readable; + nc->info->bind_ctx(&s->nc, NULL); return 0; }