[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/16] iohandler: Change return type of qemu_set_fd_h
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 12/16] iohandler: Change return type of qemu_set_fd_handler to "void" |
Date: |
Fri, 12 Jun 2015 13:57:37 +0100 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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.2
- [Qemu-devel] [PULL 01/16] stubs: Add qemu_set_fd_handler, (continued)
- [Qemu-devel] [PULL 01/16] stubs: Add qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 03/16] netmap: Drop netmap_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 04/16] net/socket: Drop net_socket_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 05/16] tap: Drop tap_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 06/16] Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 07/16] main-loop: Drop qemu_set_fd_handler2, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 08/16] alsaaudio: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 09/16] oss: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 10/16] xen_backend: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 11/16] event-notifier: Always return 0 for posix implementation, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 12/16] iohandler: Change return type of qemu_set_fd_handler to "void",
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 13/16] rocker: Add support for phys name, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 15/16] rocker: bring link up/down on PHY enable/disable, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 14/16] rocker: update tests using hw-derived interface names, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 16/16] qmp/hmp: add rocker device support, Stefan Hajnoczi, 2015/06/12
- Re: [Qemu-devel] [PULL 00/16] Net patches, Peter Maydell, 2015/06/12