mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
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>
This commit is contained in:
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user