Skip to content

Commit

Permalink
iohandler: Change return type of qemu_set_fd_handler to "void"
Browse files Browse the repository at this point in the history
Signed-off-by: Fam Zheng <[email protected]>
Message-id: [email protected]
Signed-off-by: Stefan Hajnoczi <[email protected]>
  • Loading branch information
Fam Zheng authored and stefanhaRH committed Jun 12, 2015
1 parent 1e35452 commit f4d248b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
8 changes: 4 additions & 4 deletions include/qemu/main-loop.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
/**
Expand Down
9 changes: 4 additions & 5 deletions iohandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions stubs/set-fd-handler.c
Original file line number Diff line number Diff line change
@@ -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();
}

0 comments on commit f4d248b

Please sign in to comment.