diff options
| author | Peter Maydell | 2014-06-23 13:55:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-06-23 13:55:22 +0200 |
| commit | d9c1647d896d3192cba9dbf98fb7efab876edde5 (patch) | |
| tree | a18d31b5578e0267be6ed052c6ab5096f1d127d0 /docs | |
| parent | Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (diff) | |
| parent | block: asynchronously stop the VM on I/O errors (diff) | |
| download | qemu-d9c1647d896d3192cba9dbf98fb7efab876edde5.tar.gz qemu-d9c1647d896d3192cba9dbf98fb7efab876edde5.tar.xz qemu-d9c1647d896d3192cba9dbf98fb7efab876edde5.zip | |
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 'docs')
| -rw-r--r-- | docs/qmp/qmp-events.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 019db53ec8..22fea580a9 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -62,7 +62,7 @@ Data: - "action": action that has been taken, it's one of the following (json-string): "ignore": error has been ignored "report": error has been reported to the device - "stop": error caused VM to be stopped + "stop": the VM is going to stop because of the error Example: |