From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59147 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdOfa-0002Ul-8Y for qemu-devel@nongnu.org; Thu, 13 Jan 2011 10:00:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdOfZ-0001yY-1P for qemu-devel@nongnu.org; Thu, 13 Jan 2011 10:00:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdOfY-0001yS-Px for qemu-devel@nongnu.org; Thu, 13 Jan 2011 10:00:56 -0500 From: Amit Shah Date: Thu, 13 Jan 2011 20:30:38 +0530 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 1/5] iohandlers: Avoid code duplication List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Gerd Hoffmann , Paul Brook Add a get_iohandler() function instead of looking up the ioh twice in qemu_set_fd_handler2(). Signed-off-by: Amit Shah --- vl.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/vl.c b/vl.c index 0292184..9e365f6 100644 --- a/vl.c +++ b/vl.c @@ -1022,6 +1022,17 @@ typedef struct IOHandlerRecord { static QLIST_HEAD(, IOHandlerRecord) io_handlers = QLIST_HEAD_INITIALIZER(io_handlers); +static IOHandlerRecord *get_iohandler(int fd) +{ + IOHandlerRecord *ioh; + + QLIST_FOREACH(ioh, &io_handlers, next) { + if (ioh->fd == fd) { + return ioh; + } + } + return NULL; +} /* XXX: fd_read_poll should be suppressed, but an API change is necessary in the character devices to suppress fd_can_read(). */ @@ -1033,28 +1044,25 @@ int qemu_set_fd_handler2(int fd, { IOHandlerRecord *ioh; - if (!fd_read && !fd_write) { - QLIST_FOREACH(ioh, &io_handlers, next) { - if (ioh->fd == fd) { - ioh->deleted = 1; - break; - } - } - } else { - QLIST_FOREACH(ioh, &io_handlers, next) { - if (ioh->fd == fd) - goto found; - } + ioh = get_iohandler(fd); + + if (ioh && !fd_read && !fd_write) { + ioh->deleted = 1; + return 0; + } + + if (!ioh) { ioh = qemu_mallocz(sizeof(IOHandlerRecord)); QLIST_INSERT_HEAD(&io_handlers, ioh, next); - found: + ioh->fd = fd; - ioh->fd_read_poll = fd_read_poll; - ioh->fd_read = fd_read; - ioh->fd_write = fd_write; - ioh->opaque = opaque; - ioh->deleted = 0; } + ioh->fd_read_poll = fd_read_poll; + ioh->fd_read = fd_read; + ioh->fd_write = fd_write; + ioh->opaque = opaque; + ioh->deleted = 0; + return 0; } -- 1.7.3.4