From patchwork Thu Mar 11 16:55:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 47360 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 7722EB7CE7 for ; Fri, 12 Mar 2010 04:40:59 +1100 (EST) Received: from localhost ([127.0.0.1]:56607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpmHe-0002eQ-SD for incoming@patchwork.ozlabs.org; Thu, 11 Mar 2010 12:34:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NplgJ-00051C-M6 for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:19 -0500 Received: from [199.232.76.173] (port=35576 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NplgI-00050b-V6 for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:19 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NplgF-0003st-2a for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46300) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NplgE-0003si-Dv for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:14 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2BGuDow032013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 11 Mar 2010 11:56:13 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2BGtoNw002794; Thu, 11 Mar 2010 11:56:11 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 11 Mar 2010 17:55:49 +0100 Message-Id: <435e89889409bb8742740c92a8159e05e71bd878.1268326362.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 15/16] 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 f102a82..304d05c 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) QLIST_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;