From patchwork Thu Mar 11 16:55:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 47352 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 4C718B7D12 for ; Fri, 12 Mar 2010 04:21:00 +1100 (EST) Received: from localhost ([127.0.0.1]:36945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Npm3K-0005Ar-8j for incoming@patchwork.ozlabs.org; Thu, 11 Mar 2010 12:20:06 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NplgA-0004vb-PK for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:10 -0500 Received: from [199.232.76.173] (port=35558 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nplg9-0004v1-CB for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:09 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nplg7-0003qq-Fu for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24883) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nplg7-0003qU-1n for qemu-devel@nongnu.org; Thu, 11 Mar 2010 11:56:07 -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 o2BGu6SR031999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 11 Mar 2010 11:56:06 -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 o2BGtoNr002794; Thu, 11 Mar 2010 11:56:05 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 11 Mar 2010 17:55:44 +0100 Message-Id: <6fcbaba6d61cb815e58a7c3f5076a39646661026.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 10/16] qemu-char:tcp insert poll call into read one 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 This way we can remove the poll test Signed-off-by: Juan Quintela --- qemu-char.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 93b3ea4..063da94 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1899,16 +1899,6 @@ static int tcp_chr_write(CharDriverState *chr, const uint8_t *buf, int len) } } -static int tcp_chr_read_poll(void *opaque) -{ - CharDriverState *chr = opaque; - TCPCharDriver *s = chr->opaque; - if (!s->connected) - return 0; - s->max_size = qemu_chr_can_read(chr); - return s->max_size; -} - #define IAC 255 #define IAC_BREAK 243 static void tcp_chr_process_IAC_bytes(CharDriverState *chr, @@ -2030,7 +2020,10 @@ static void tcp_chr_read(void *opaque) uint8_t buf[READ_BUF_LEN]; int len, size; - if (!s->connected || s->max_size <= 0) + if (!s->connected) + return; + s->max_size = qemu_chr_can_read(chr); + if (s->max_size <= 0) return; len = sizeof(buf); if (len > s->max_size) @@ -2064,8 +2057,7 @@ static void tcp_chr_connect(void *opaque) TCPCharDriver *s = chr->opaque; s->connected = 1; - qemu_set_fd_handler2(s->fd, tcp_chr_read_poll, - tcp_chr_read, NULL, chr); + qemu_set_fd_handler(s->fd, tcp_chr_read, NULL, chr); qemu_chr_generic_open(chr); }