diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-24 15:04:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-24 15:04:47 +0000 |
| commit | 8b7a3e1e5434b55d7710071b00af97c7086cab7a (patch) | |
| tree | 874d25956d51a371578115b32515856d37d67900 /qobject/json-parser.c | |
| parent | b6b2308113f8aad981f070968e0202f9ef2e6554 (diff) | |
| parent | 8595685986152334b1ec28c78cb0e5e855d56b54 (diff) | |
| download | focaccia-qemu-8b7a3e1e5434b55d7710071b00af97c7086cab7a.tar.gz focaccia-qemu-8b7a3e1e5434b55d7710071b00af97c7086cab7a.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request Changelog: No user-visible changes. # gpg: Signature made Thu 24 Jan 2019 10:28:53 GMT # gpg: using RSA key 9CA4ABB381AB73C8 # 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: qemu-coroutine-sleep: drop CoSleepCB iotests: add 238 for throttling tgm unregister iothread segfault throttle-groups: fix restart coroutine iothread race Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-parser.c')
0 files changed, 0 insertions, 0 deletions