diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-03-20 15:06:31 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-04-04 20:48:02 +0200 |
| commit | 8c2664d86917c987944f1ca9770d1f7bbbf8eca8 (patch) | |
| tree | 617e3ec3b74b879a21630460bfd3db403d95bce9 | |
| parent | 4d1cb6e6f51b0d8405f701806a203a73e7431fe5 (diff) | |
| download | focaccia-qemu-8c2664d86917c987944f1ca9770d1f7bbbf8eca8.tar.gz focaccia-qemu-8c2664d86917c987944f1ca9770d1f7bbbf8eca8.zip | |
iothread: make IOThread struct definition public
Make the IOThread struct definition public so objects can be embedded in parent structs. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | include/sysemu/iothread.h | 12 | ||||
| -rw-r--r-- | iothread.c | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index a32214a647..7c01a61d5e 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -15,10 +15,20 @@ #define IOTHREAD_H #include "block/aio.h" +#include "qemu/thread.h" #define TYPE_IOTHREAD "iothread" -typedef struct IOThread IOThread; +typedef struct { + Object parent_obj; + + QemuThread thread; + AioContext *ctx; + QemuMutex init_done_lock; + QemuCond init_done_cond; /* is thread initialization done? */ + bool stopping; + int thread_id; +} IOThread; #define IOTHREAD(obj) \ OBJECT_CHECK(IOThread, obj, TYPE_IOTHREAD) diff --git a/iothread.c b/iothread.c index cb5986b6c9..1fbf9f1c49 100644 --- a/iothread.c +++ b/iothread.c @@ -14,7 +14,6 @@ #include "qom/object.h" #include "qom/object_interfaces.h" #include "qemu/module.h" -#include "qemu/thread.h" #include "block/aio.h" #include "sysemu/iothread.h" #include "qmp-commands.h" @@ -22,16 +21,6 @@ #define IOTHREADS_PATH "/objects" typedef ObjectClass IOThreadClass; -struct IOThread { - Object parent_obj; - - QemuThread thread; - AioContext *ctx; - QemuMutex init_done_lock; - QemuCond init_done_cond; /* is thread initialization done? */ - bool stopping; - int thread_id; -}; #define IOTHREAD_GET_CLASS(obj) \ OBJECT_GET_CLASS(IOThreadClass, obj, TYPE_IOTHREAD) |