summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPeter Maydell2017-10-05 13:02:21 +0200
committerPeter Maydell2017-10-05 13:02:21 +0200
commit5456c6a4ec9cd8fc314ddc303e88bf85c110975c (patch)
tree8e4786bfdf43921d8ff54aa6cf279769612d184d /scripts
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
parentaio: fix assert when remove poll during destroy (diff)
downloadqemu-5456c6a4ec9cd8fc314ddc303e88bf85c110975c.tar.gz
qemu-5456c6a4ec9cd8fc314ddc303e88bf85c110975c.tar.xz
qemu-5456c6a4ec9cd8fc314ddc303e88bf85c110975c.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 03 Oct 2017 19:53:34 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # 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: aio: fix assert when remove poll during destroy iothread: delay the context release to finalize iothread: export iothread_stop() iothread: provide helpers for internal use qom: provide root container for internal objs Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions