Commit 3f5e34a4 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c98e7937 de3e15a7

util/rfifolock.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}