From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuXds-0005Hr-82 for qemu-devel@nongnu.org; Mon, 18 May 2015 22:52:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuXdp-0002De-Nn for qemu-devel@nongnu.org; Mon, 18 May 2015 22:52:28 -0400 From: Fam Zheng Date: Tue, 19 May 2015 10:51:10 +0000 Message-Id: <1432032670-15124-14-git-send-email-famz@redhat.com> In-Reply-To: <1432032670-15124-1-git-send-email-famz@redhat.com> References: <1432032670-15124-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v3 13/13] iohandler: Change return type of qemu_set_fd_handler to "void" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Juan Quintela , Jason Wang , Vincenzo Maffione , "Vassili Karpov (malc)" , Gerd Hoffmann , Stefan Hajnoczi , Amit Shah , Paolo Bonzini , Giuseppe Lettieri , Luigi Rizzo Signed-off-by: Fam Zheng --- include/qemu/main-loop.h | 8 ++++---- iohandler.c | 9 ++++----- stubs/set-fd-handler.c | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 7da1d63..0f4a0fd 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -198,10 +198,10 @@ typedef int IOCanReadHandler(void *opaque); * * @opaque: A pointer-sized value that is passed to @fd_read and @fd_write. */ -int qemu_set_fd_handler(int fd, - IOHandler *fd_read, - IOHandler *fd_write, - void *opaque); +void qemu_set_fd_handler(int fd, + IOHandler *fd_read, + IOHandler *fd_write, + void *opaque); #ifdef CONFIG_POSIX /** diff --git a/iohandler.c b/iohandler.c index d361cf2..826f713 100644 --- a/iohandler.c +++ b/iohandler.c @@ -45,10 +45,10 @@ typedef struct IOHandlerRecord { static QLIST_HEAD(, IOHandlerRecord) io_handlers = QLIST_HEAD_INITIALIZER(io_handlers); -int qemu_set_fd_handler(int fd, - IOHandler *fd_read, - IOHandler *fd_write, - void *opaque) +void qemu_set_fd_handler(int fd, + IOHandler *fd_read, + IOHandler *fd_write, + void *opaque) { IOHandlerRecord *ioh; @@ -77,7 +77,6 @@ int qemu_set_fd_handler(int fd, ioh->deleted = 0; qemu_notify_event(); } - return 0; } void qemu_iohandler_fill(GArray *pollfds) diff --git a/stubs/set-fd-handler.c b/stubs/set-fd-handler.c index a895e62..a8481bc 100644 --- a/stubs/set-fd-handler.c +++ b/stubs/set-fd-handler.c @@ -1,10 +1,10 @@ #include "qemu-common.h" #include "qemu/main-loop.h" -int qemu_set_fd_handler(int fd, - IOHandler *fd_read, - IOHandler *fd_write, - void *opaque) +void qemu_set_fd_handler(int fd, + IOHandler *fd_read, + IOHandler *fd_write, + void *opaque) { abort(); } -- 2.4.1