summaryrefslogtreecommitdiff
path: root/softmmu_template.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-04-22 16:17:12 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-04-22 16:17:12 +0100
commit53343338a6e7b83777b82803398572b40afc8c0f (patch)
treea6b16ffcb414941d0cd6c63d0c7c3050a3a73451 /softmmu_template.h
parentee1e0f8e5d3682c561edcdceccff72b9d9b16d8b (diff)
parentab27c3b5e7408693dde0b565f050aa55c4a1bcef (diff)
downloadqemu-53343338a6e7b83777b82803398572b40afc8c0f.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Mirror block job fixes for 2.6.0-rc4 # gpg: Signature made Fri 22 Apr 2016 15:46:41 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: mirror: Workaround for unexpected iohandler events during completion aio-posix: Skip external nodes in aio_dispatch virtio: Mark host notifiers as external event-notifier: Add "is_external" parameter iohandler: Introduce iohandler_get_aio_context Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu_template.h')
0 files changed, 0 insertions, 0 deletions