summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-06-23 12:55:22 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-06-23 12:55:22 +0100
commitd9c1647d896d3192cba9dbf98fb7efab876edde5 (patch)
treea18d31b5578e0267be6ed052c6ab5096f1d127d0 /include/ui
parent910f66fcda2d410249697d959dcbdf8c82d77844 (diff)
parent2bd3bce8efebe86b031beab5c0e3b9bbaec0b502 (diff)
downloadhqemu-d9c1647d896d3192cba9dbf98fb7efab876edde5.zip
hqemu-d9c1647d896d3192cba9dbf98fb7efab876edde5.tar.gz
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Block pull request # gpg: Signature made Mon 23 Jun 2014 09:53:49 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: block: asynchronously stop the VM on I/O errors vl: allow other threads to do qemu_system_vmstop_request sheepdog: fix NULL dereference in sd_create QemuOpts: check NULL opts in qemu_opt_get functions block: m25p80: Support read only bdrvs. block: m25p80: sync_page(): Deindent function body. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud