diff options
| author | Peter Maydell | 2014-04-05 01:18:19 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-04-05 01:18:19 +0200 |
| commit | 8ae60ee85ceaea6bfc4c62fb8ed180a1ba8010a5 (patch) | |
| tree | 6af18d5958af66edb12948805bfe3bf01516ffa6 /include | |
| parent | cpu-exec: Unlock tb_lock if we longjmp out of code generation (diff) | |
| parent | dataplane: replace iothread object_add() with embedded instance (diff) | |
| download | qemu-8ae60ee85ceaea6bfc4c62fb8ed180a1ba8010a5.tar.gz qemu-8ae60ee85ceaea6bfc4c62fb8ed180a1ba8010a5.tar.xz qemu-8ae60ee85ceaea6bfc4c62fb8ed180a1ba8010a5.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.0.0
# gpg: Signature made Fri 04 Apr 2014 20:25:08 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
dataplane: replace iothread object_add() with embedded instance
iothread: make IOThread struct definition public
dma-helpers: Initialize DMAAIOCB in_cancel flag
block: Check bdrv_getlength() return value in bdrv_append_temp_snapshot()
block: Fix snapshot=on for protocol parsed from filename
qemu-iotests: Remove CR line endings in reference output
block: Don't parse 'filename' option
qcow2: Put cache reference in error case
qcow2: Flush metadata during read-only reopen
iscsi: Don't set error if already set in iscsi_do_inquiry
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 1 | ||||
| -rw-r--r-- | include/sysemu/iothread.h | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/block/block.h b/include/block/block.h index 1ed55d839a..b3230a25f6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -190,6 +190,7 @@ int bdrv_open_image(BlockDriverState **pbs, const char *filename, QDict *options, const char *bdref_key, int flags, bool allow_none, Error **errp); int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp); +void bdrv_append_temp_snapshot(BlockDriverState *bs, Error **errp); int bdrv_open(BlockDriverState **pbs, const char *filename, const char *reference, QDict *options, int flags, BlockDriver *drv, Error **errp); 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) |