From patchwork Wed Mar 10 10:03:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 47226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6DA8EB7CE8 for ; Wed, 10 Mar 2010 21:34:28 +1100 (EST) Received: from localhost ([127.0.0.1]:49574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJEz-0002IV-V5 for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 05:34:13 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpIlb-0003uq-Dz for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:51 -0500 Received: from [199.232.76.173] (port=49341 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpIlZ-0003u8-U8 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:49 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpIlY-0001u1-CX for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62440) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpIlX-0001tq-Pc for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:48 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2AA3kL3017218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Mar 2010 05:03:47 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2AA3SbO017099; Wed, 10 Mar 2010 05:03:46 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:03:27 +0100 Message-Id: <075d1812dc54d5a4e69d9a10360645bfbcdaddf9.1268214633.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 13/14] Remove now unused fd_read_poll and all its only left user X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- vl.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index a961710..3bf8b87 100644 --- a/vl.c +++ b/vl.c @@ -2590,7 +2590,6 @@ void pcmcia_info(Monitor *mon) typedef struct IOHandlerRecord { int fd; - IOCanReadHandler *fd_read_poll; IOHandler *fd_read; IOHandler *fd_write; int deleted; @@ -3809,9 +3808,7 @@ void main_loop_wait(int timeout) QTAILQ_FOREACH(ioh, &io_handlers, next) { if (ioh->deleted) continue; - if (ioh->fd_read && - (!ioh->fd_read_poll || - ioh->fd_read_poll(ioh->opaque) != 0)) { + if (ioh->fd_read) { FD_SET(ioh->fd, &rfds); if (ioh->fd > nfds) nfds = ioh->fd;