diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-11 13:54:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-11 13:54:00 +0100 |
| commit | 9ad2c8cd41a086020e21aa6d616b73bd5e2a800b (patch) | |
| tree | 9e53cd27d30f066fb6bebcf0b9cfac5f1347efb1 /docs/qmp | |
| parent | b951cda21d6b232f138ccf008e12bce8ddc95465 (diff) | |
| parent | 0caef8f6df4a9426bd6333ab843ce51ce005d7d0 (diff) | |
| download | qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.zip qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.tar.gz qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-05-09' into staging
trivial patches for 2015-05-09
# gpg: Signature made Fri May 8 22:58:42 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-05-09:
docs: update BLOCK_IMAGE_CORRUPTED documentation
glib-compat.h: change assert to g_assert
Remove various unused functions
sheepdog: fix resource leak with sd_snapshot_create
xhci: remove unused code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/qmp')
| -rw-r--r-- | docs/qmp/qmp-events.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index b19e490..64ba46c 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -43,9 +43,10 @@ Data: - "msg": Informative message (e.g., reason for the corruption) (json-string) - "offset": If the corruption resulted from an image access, this - is the access offset into the image (json-int) + is the host's access offset into the image + (json-int, optional) - "size": If the corruption resulted from an image access, this - is the access size (json-int) + is the access size (json-int, optional) Example: |