diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-09 17:35:48 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-09 17:35:48 +0000 |
| commit | f5b4c31030f45293bb4517445722768434829d91 (patch) | |
| tree | f2b86219f1698347782e57420563cd31d1024d49 /include | |
| parent | 4c76137484878f42a2ce1ae1b888b6a7f66b4053 (diff) | |
| parent | 6ca206204fa773c8626d59caf2a5676d6cc35f52 (diff) | |
| download | focaccia-qemu-f5b4c31030f45293bb4517445722768434829d91.tar.gz focaccia-qemu-f5b4c31030f45293bb4517445722768434829d91.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request # gpg: Signature made Fri 08 Mar 2019 16:53:34 GMT # gpg: using RSA key 9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: iothread: document about why we need explicit aio_poll() iothread: push gcontext earlier in the thread_fn iothread: create main loop unconditionally iothread: create the gcontext unconditionally iothread: replace init_done_cond with a semaphore hw/block/virtio-blk: Clean req->dev repetitions MAINTAINERS: add missing support status fields Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/iothread.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 8a7ac2c528..5f6240d5cb 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -24,11 +24,10 @@ typedef struct { QemuThread thread; AioContext *ctx; + bool run_gcontext; /* whether we should run gcontext */ GMainContext *worker_context; GMainLoop *main_loop; - GOnce once; - QemuMutex init_done_lock; - QemuCond init_done_cond; /* is thread initialization done? */ + QemuSemaphore init_done_sem; /* is thread init done? */ bool stopping; /* has iothread_stop() been called? */ bool running; /* should iothread_run() continue? */ int thread_id; |