diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 10:35:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 10:35:50 +0100 |
| commit | 3f5e34a45c78086b73ec4e1a0268ec26169fee80 (patch) | |
| tree | d7902c9f53d8353b00d65334e1fdd4f1c642b920 | |
| parent | c98e7937119503d06dbb494b7e4806ec66a27df0 (diff) | |
| parent | de3e15a705cbb4b54b2a749f8d5131c9f1666fb3 (diff) | |
| download | qemu-3f5e34a45c78086b73ec4e1a0268ec26169fee80.zip qemu-3f5e34a45c78086b73ec4e1a0268ec26169fee80.tar.gz qemu-3f5e34a45c78086b73ec4e1a0268ec26169fee80.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 17 May 2016 01:19:39 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
rfifolock: no need to get thread identifier when nesting
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | util/rfifolock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/rfifolock.c b/util/rfifolock.c index c22f5fe..084c2f0 100644 --- a/util/rfifolock.c +++ b/util/rfifolock.c @@ -58,9 +58,9 @@ void rfifolock_lock(RFifoLock *r) } qemu_cond_wait(&r->cond, &r->lock); } + qemu_thread_get_self(&r->owner_thread); } - qemu_thread_get_self(&r->owner_thread); r->nesting++; qemu_mutex_unlock(&r->lock); } |