diff options
| author | Benoît Canet <benoit.canet@irqsave.net> | 2014-06-30 17:05:41 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-07-01 10:15:34 +0200 |
| commit | 4e855baabfb548067b618808c32dc413d40e0bc7 (patch) | |
| tree | 3f7f4778054d0765c95c7b98a9ec8c285432754f | |
| parent | 6764579f894950afe87d8ec3b323adde8925d4fd (diff) | |
| download | qemu-4e855baabfb548067b618808c32dc413d40e0bc7.tar.gz | |
qapi: Change back sector-count to sectors-count in quorum QAPI events.
fe069d9d had aligned code and documentation while dropping the s from the
actual JSON output. Fix that.
This also fix test/qemu-iotest/081 since the missing s was causing a permutation.
Signed-off-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | docs/qmp/qmp-events.txt | 26 | ||||
| -rw-r--r-- | qapi/event.json | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 44be891261..4a6c2a2c45 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -250,14 +250,14 @@ Emitted by the Quorum block driver if it fails to establish a quorum. Data: -- "reference": device name if defined else node name. -- "sector-num": Number of the first sector of the failed read operation. -- "sector-count": Failed read operation sector count. +- "reference": device name if defined else node name. +- "sector-num": Number of the first sector of the failed read operation. +- "sectors-count": Failed read operation sector count. Example: { "event": "QUORUM_FAILURE", - "data": { "reference": "usr1", "sector-num": 345435, "sector-count": 5 }, + "data": { "reference": "usr1", "sector-num": 345435, "sectors-count": 5 }, "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } QUORUM_REPORT_BAD @@ -267,19 +267,19 @@ Emitted to report a corruption of a Quorum file. Data: -- "error": Error message (json-string, optional) - Only present on failure. This field contains a human-readable - error message. There are no semantics other than that the - block layer reported an error and clients should not try to - interpret the error string. -- "node-name": The graph node name of the block driver state. -- "sector-num": Number of the first sector of the failed read operation. -- "sector-count": Failed read operation sector count. +- "error": Error message (json-string, optional) + Only present on failure. This field contains a human-readable + error message. There are no semantics other than that the + block layer reported an error and clients should not try to + interpret the error string. +- "node-name": The graph node name of the block driver state. +- "sector-num": Number of the first sector of the failed read operation. +- "sectors-count": Failed read operation sector count. Example: { "event": "QUORUM_REPORT_BAD", - "data": { "node-name": "1.raw", "sector-num": 345435, "sector-count": 5 }, + "data": { "node-name": "1.raw", "sector-num": 345435, "sectors-count": 5 }, "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } RESET diff --git a/qapi/event.json b/qapi/event.json index ff97aeb377..c51dc491e0 100644 --- a/qapi/event.json +++ b/qapi/event.json @@ -288,12 +288,12 @@ # # @sector-num: number of the first sector of the failed read operation # -# @sector-count: failed read operation sector count +# @sectors-count: failed read operation sector count # # Since: 2.0 ## { 'event': 'QUORUM_FAILURE', - 'data': { 'reference': 'str', 'sector-num': 'int', 'sector-count': 'int' } } + 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': 'int' } } ## # @QUORUM_REPORT_BAD @@ -309,13 +309,13 @@ # # @sector-num: number of the first sector of the failed read operation # -# @sector-count: failed read operation sector count +# @sectors-count: failed read operation sector count # # Since: 2.0 ## { 'event': 'QUORUM_REPORT_BAD', 'data': { '*error': 'str', 'node-name': 'str', - 'sector-num': 'int', 'sector-count': 'int' } } + 'sector-num': 'int', 'sectors-count': 'int' } } ## # @VSERPORT_CHANGE |