From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQdcP-0003xg-CC for qemu-devel@nongnu.org; Thu, 20 Mar 2014 10:06:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQdcI-0006df-54 for qemu-devel@nongnu.org; Thu, 20 Mar 2014 10:06:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQdcH-0006dX-Rb for qemu-devel@nongnu.org; Thu, 20 Mar 2014 10:06:42 -0400 From: Stefan Hajnoczi Date: Thu, 20 Mar 2014 15:06:31 +0100 Message-Id: <1395324392-2142-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1395324392-2142-1-git-send-email-stefanha@redhat.com> References: <1395324392-2142-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH for-2.0 1/2] iothread: make IOThread struct definition public List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Christian Borntraeger Make the IOThread struct definition public so objects can be embedded in parent structs. Signed-off-by: Stefan Hajnoczi --- include/sysemu/iothread.h | 12 +++++++++++- iothread.c | 11 ----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index a32214a..7c01a61 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 cb5986b..1fbf9f1 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) -- 1.8.5.3