[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] iothread: make IOThread struct definition publ
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 09/10] iothread: make IOThread struct definition public |
Date: |
Fri, 4 Apr 2014 21:27:48 +0200 |
From: Stefan Hajnoczi <address@hidden>
Make the IOThread struct definition public so objects can be embedded in
parent structs.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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.3.1
- [Qemu-devel] [PULL 00/10] Block patches for 2.0, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 02/10] qcow2: Flush metadata during read-only reopen, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 01/10] iscsi: Don't set error if already set in iscsi_do_inquiry, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 03/10] qcow2: Put cache reference in error case, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 04/10] block: Don't parse 'filename' option, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 06/10] block: Fix snapshot=on for protocol parsed from filename, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 05/10] qemu-iotests: Remove CR line endings in reference output, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 08/10] dma-helpers: Initialize DMAAIOCB in_cancel flag, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 07/10] block: Check bdrv_getlength() return value in bdrv_append_temp_snapshot(), Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 09/10] iothread: make IOThread struct definition public,
Kevin Wolf <=
- [Qemu-devel] [PULL 10/10] dataplane: replace iothread object_add() with embedded instance, Kevin Wolf, 2014/04/04
- Re: [Qemu-devel] [PULL 00/10] Block patches for 2.0, Peter Maydell, 2014/04/05