From patchwork Wed Mar 10 10:03:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 47217 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 AB8F3B7C59 for ; Wed, 10 Mar 2010 21:16:16 +1100 (EST) Received: from localhost ([127.0.0.1]:42044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpIth-0006Kl-OJ for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 05:12:13 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpIlP-0003pu-4E for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:39 -0500 Received: from [199.232.76.173] (port=49322 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpIlO-0003pf-Fa for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:38 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpIlL-0001rH-VT for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27117) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpIlL-0001qw-3h for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:03:35 -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 o2AA3Y5e018937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Mar 2010 05:03:34 -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 o2AA3SbE017099; Wed, 10 Mar 2010 05:03:33 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:03:17 +0100 Message-Id: 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 03/14] rename IOCanRWHandler to IOCanReadHandler 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 It was always only used for reads Signed-off-by: Juan Quintela --- qemu-char.c | 4 ++-- qemu-char.h | 7 +++---- qemu-common.h | 2 +- qemu-tool.c | 2 +- vl.c | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 86c7c5a..6ea4e8c 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -182,7 +182,7 @@ void qemu_chr_send_event(CharDriverState *s, int event) } void qemu_chr_add_handlers(CharDriverState *s, - IOCanRWHandler *fd_can_read, + IOCanReadHandler *fd_can_read, IOReadHandler *fd_read, IOEventHandler *fd_event, void *opaque) @@ -214,7 +214,7 @@ static CharDriverState *qemu_chr_open_null(QemuOpts *opts) #define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */ #define MUX_BUFFER_MASK (MUX_BUFFER_SIZE - 1) typedef struct { - IOCanRWHandler *chr_can_read[MAX_MUX]; + IOCanReadHandler *chr_can_read[MAX_MUX]; IOReadHandler *chr_read[MAX_MUX]; IOEventHandler *chr_event[MAX_MUX]; void *ext_opaque[MAX_MUX]; diff --git a/qemu-char.h b/qemu-char.h index bcc0766..3a9427b 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -57,7 +57,7 @@ struct CharDriverState { int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg); int (*get_msgfd)(struct CharDriverState *s); IOEventHandler *chr_event; - IOCanRWHandler *chr_can_read; + IOCanReadHandler *chr_can_read; IOReadHandler *chr_read; void *handler_opaque; void (*chr_send_event)(struct CharDriverState *chr, int event); @@ -79,7 +79,7 @@ void qemu_chr_printf(CharDriverState *s, const char *fmt, ...); int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len); void qemu_chr_send_event(CharDriverState *s, int event); void qemu_chr_add_handlers(CharDriverState *s, - IOCanRWHandler *fd_can_read, + IOCanReadHandler *fd_can_read, IOReadHandler *fd_read, IOEventHandler *fd_event, void *opaque); @@ -98,7 +98,7 @@ extern int term_escape_char; /* async I/O support */ int qemu_set_fd_handler2(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque); @@ -106,5 +106,4 @@ int qemu_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque); - #endif diff --git a/qemu-common.h b/qemu-common.h index 805be1a..42bfbcd 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -183,7 +183,7 @@ void QEMU_NORETURN hw_error(const char *fmt, ...) /* IO callbacks. */ typedef void IOReadHandler(void *opaque, const uint8_t *buf, int size); -typedef int IOCanRWHandler(void *opaque); +typedef int IOCanReadHandler(void *opaque); typedef void IOHandler(void *opaque); struct ParallelIOArg { diff --git a/qemu-tool.c b/qemu-tool.c index 18b48af..45e6df9 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -91,7 +91,7 @@ void qemu_bh_delete(QEMUBH *bh) } int qemu_set_fd_handler2(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque) diff --git a/vl.c b/vl.c index 83ff652..354ea31 100644 --- a/vl.c +++ b/vl.c @@ -2590,7 +2590,7 @@ void pcmcia_info(Monitor *mon) typedef struct IOHandlerRecord { int fd; - IOCanRWHandler *fd_read_poll; + IOCanReadHandler *fd_read_poll; IOHandler *fd_read; IOHandler *fd_write; int deleted; @@ -2607,7 +2607,7 @@ static QTAILQ_HEAD(, IOHandlerRecord) io_handlers = /* XXX: fd_read_poll should be suppressed, but an API change is necessary in the character devices to suppress fd_can_read(). */ int qemu_set_fd_handler2(int fd, - IOCanRWHandler *fd_read_poll, + IOCanReadHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, void *opaque)