[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 1/5] iohandler: Introduce iohandler_get_aio_context
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 1/5] iohandler: Introduce iohandler_get_aio_context |
Date: |
Fri, 22 Apr 2016 17:05:37 +0200 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
include/qemu/main-loop.h | 1 +
iohandler.c | 6 ++++++
stubs/Makefile.objs | 1 +
stubs/iohandler.c | 8 ++++++++
4 files changed, 16 insertions(+)
create mode 100644 stubs/iohandler.c
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index 9976909..19b5de3 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -204,6 +204,7 @@ void qemu_set_fd_handler(int fd,
void *opaque);
GSource *iohandler_get_g_source(void);
+AioContext *iohandler_get_aio_context(void);
#ifdef CONFIG_POSIX
/**
* qemu_add_child_watch: Register a child process for reaping.
diff --git a/iohandler.c b/iohandler.c
index 3f23433..f2fc8a9 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -44,6 +44,12 @@ static void iohandler_init(void)
}
}
+AioContext *iohandler_get_aio_context(void)
+{
+ iohandler_init();
+ return iohandler_ctx;
+}
+
GSource *iohandler_get_g_source(void)
{
iohandler_init();
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index b6d1e65..4b258a6 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -40,3 +40,4 @@ stub-obj-y += qmp_pc_dimm_device_list.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += vhost.o
+stub-obj-y += iohandler.o
diff --git a/stubs/iohandler.c b/stubs/iohandler.c
new file mode 100644
index 0000000..22b0ee5
--- /dev/null
+++ b/stubs/iohandler.c
@@ -0,0 +1,8 @@
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "qemu/main-loop.h"
+
+AioContext *iohandler_get_aio_context(void)
+{
+ abort();
+}
--
1.8.3.1
- [Qemu-block] [PULL 0/5] Mirror block job fixes for 2.6.0-rc4, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 3/5] virtio: Mark host notifiers as external, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 2/5] event-notifier: Add "is_external" parameter, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 1/5] iohandler: Introduce iohandler_get_aio_context,
Kevin Wolf <=
- [Qemu-block] [PULL 4/5] aio-posix: Skip external nodes in aio_dispatch, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 5/5] mirror: Workaround for unexpected iohandler events during completion, Kevin Wolf, 2016/04/22
- Re: [Qemu-block] [PULL 0/5] Mirror block job fixes for 2.6.0-rc4, Peter Maydell, 2016/04/22