From patchwork Tue Oct 11 11:35:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 118963 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CEE45B6F6F for ; Tue, 11 Oct 2011 22:54:20 +1100 (EST) Received: from localhost ([::1]:38723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDadq-0001pc-AD for incoming@patchwork.ozlabs.org; Tue, 11 Oct 2011 07:37:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDacl-0007JQ-9a for qemu-devel@nongnu.org; Tue, 11 Oct 2011 07:35:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDacj-0005Rb-Et for qemu-devel@nongnu.org; Tue, 11 Oct 2011 07:35:55 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:42014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDacj-0005Nm-9N for qemu-devel@nongnu.org; Tue, 11 Oct 2011 07:35:53 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so7909767wyh.4 for ; Tue, 11 Oct 2011 04:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=GW5YybPGgv7sPAPYuLBsu8mzt/ZkBaEyOoLcC0ByHfY=; b=kjhFzrcj9Qejvr7652mkhUMxjFSwrnoe0IVW8B/C+Iv5I9V2tqk1qigYtQbbfUPHnI I8T5QzuOkZqubBRhjf2aLXzGmzIdqsqc44w2MAqLgrsQdu4JnFWtFXAC4vDVtUutbyXM WmaakXQSe+rgnIsHfeKA2E7Ke9kntzOWcrMnA= Received: by 10.227.58.144 with SMTP id g16mr7637139wbh.11.1318332952845; Tue, 11 Oct 2011 04:35:52 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id l9sm38043390wba.5.2011.10.11.04.35.51 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Oct 2011 04:35:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 11 Oct 2011 13:35:29 +0200 Message-Id: <1318332930-16217-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1318332930-16217-1-git-send-email-pbonzini@redhat.com> References: <1318332930-16217-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH 12/13] Revert to a hand-made select loop 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 This reverts commit c82dc29a9112f34e0a51cad9a412cf6d9d05dfb2 and 4d88a2ac8643265108ef1fb47ceee5d7b28e19f2. Signed-off-by: Paolo Bonzini --- iohandler.c | 54 +----------------------------------------------------- 1 files changed, 1 insertions(+), 53 deletions(-) diff --git a/iohandler.c b/iohandler.c index 4cc1c5a..4deae1e 100644 --- a/iohandler.c +++ b/iohandler.c @@ -80,64 +80,12 @@ int qemu_set_fd_handler2(int fd, return 0; } -typedef struct IOTrampoline -{ - GIOChannel *chan; - IOHandler *fd_read; - IOHandler *fd_write; - void *opaque; - guint tag; -} IOTrampoline; - -static gboolean fd_trampoline(GIOChannel *chan, GIOCondition cond, gpointer opaque) -{ - IOTrampoline *tramp = opaque; - - if ((cond & G_IO_IN) && tramp->fd_read) { - tramp->fd_read(tramp->opaque); - } - - if ((cond & G_IO_OUT) && tramp->fd_write) { - tramp->fd_write(tramp->opaque); - } - - return TRUE; -} - int qemu_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque) { - static IOTrampoline fd_trampolines[FD_SETSIZE]; - IOTrampoline *tramp = &fd_trampolines[fd]; - - if (tramp->tag != 0) { - g_io_channel_unref(tramp->chan); - g_source_remove(tramp->tag); - tramp->tag = 0; - } - - if (fd_read || fd_write || opaque) { - GIOCondition cond = 0; - - tramp->fd_read = fd_read; - tramp->fd_write = fd_write; - tramp->opaque = opaque; - - if (fd_read) { - cond |= G_IO_IN | G_IO_ERR; - } - - if (fd_write) { - cond |= G_IO_OUT | G_IO_ERR; - } - - tramp->chan = g_io_channel_unix_new(fd); - tramp->tag = g_io_add_watch(tramp->chan, cond, fd_trampoline, tramp); - } - - return 0; + return qemu_set_fd_handler2(fd, NULL, fd_read, fd_write, opaque); } void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds, fd_set *xfds)