diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-05 12:02:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-05 12:02:21 +0100 |
| commit | 5456c6a4ec9cd8fc314ddc303e88bf85c110975c (patch) | |
| tree | 8e4786bfdf43921d8ff54aa6cf279769612d184d /include | |
| parent | d147f7e815f97cb477e223586bcb80c316ae10ea (diff) | |
| parent | f708a5e71cba0d784e307334c07ade5f56f827ab (diff) | |
| download | qemu-5456c6a4ec9cd8fc314ddc303e88bf85c110975c.zip qemu-5456c6a4ec9cd8fc314ddc303e88bf85c110975c.tar.gz qemu-5456c6a4ec9cd8fc314ddc303e88bf85c110975c.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 03 Oct 2017 19:53:34 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
aio: fix assert when remove poll during destroy
iothread: delay the context release to finalize
iothread: export iothread_stop()
iothread: provide helpers for internal use
qom: provide root container for internal objs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qom/object.h | 11 | ||||
| -rw-r--r-- | include/sysemu/iothread.h | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/qom/object.h b/include/qom/object.h index f3e5cff..e0d9824 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1214,6 +1214,17 @@ Object *object_get_root(void); Object *object_get_objects_root(void); /** + * object_get_internal_root: + * + * Get the container object that holds internally used object + * instances. Any object which is put into this container must not be + * user visible, and it will not be exposed in the QOM tree. + * + * Returns: the internal object container + */ +Object *object_get_internal_root(void); + +/** * object_get_canonical_path_component: * * Returns: The final component in the object's canonical path. The canonical diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index d2985b3..110329b 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -46,4 +46,13 @@ AioContext *iothread_get_aio_context(IOThread *iothread); void iothread_stop_all(void); GMainContext *iothread_get_g_main_context(IOThread *iothread); +/* + * Helpers used to allocate iothreads for internal use. These + * iothreads will not be seen by monitor clients when query using + * "query-iothreads". + */ +IOThread *iothread_create(const char *id, Error **errp); +void iothread_stop(IOThread *iothread); +void iothread_destroy(IOThread *iothread); + #endif /* IOTHREAD_H */ |