diff mbox

[v2,for-2.6,1/5] iohandler: Introduce iohandler_get_aio_context

Message ID 1461322564-17440-2-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng April 22, 2016, 10:56 a.m. UTC
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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

Comments

Michael S. Tsirkin April 22, 2016, 1:46 p.m. UTC | #1
On Fri, Apr 22, 2016 at 06:56:00PM +0800, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  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();
> +}
> -- 
> 2.8.0
diff mbox

Patch

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();
+}