xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-02 10:12:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qapi: Change back sector-count to sectors-count in quorum QAPI events.

Browse Source 
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>
This commit is contained in:
Benoît Canet 2014-06-30 17:05:41 +02:00 committed by Stefan Hajnoczi
parent 6764579f89
commit 4e855baabf
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/qmp/qmp-events.txt
View File

@ -252,12 +252,12 @@ Data:
- "reference": device name if defined else node name. - "reference": device name if defined else node name.
- "sector-num": Number of the first sector of the failed read operation. - "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.
Example: Example:
{ "event": "QUORUM_FAILURE", { "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 } } "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
QUORUM_REPORT_BAD QUORUM_REPORT_BAD
@ -274,12 +274,12 @@ Data:
interpret the error string. interpret the error string.
- "node-name": The graph node name of the block driver state. - "node-name": The graph node name of the block driver state.
- "sector-num": Number of the first sector of the failed read operation. - "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.
Example: Example:
{ "event": "QUORUM_REPORT_BAD", { "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 } } "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
RESET RESET

8
qapi/event.json
View File

@ -288,12 +288,12 @@
# #
# @sector-num: number of the first sector of the failed read operation # @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 # Since: 2.0
## ##
{ 'event': 'QUORUM_FAILURE', { 'event': 'QUORUM_FAILURE',
'data': { 'reference': 'str', 'sector-num': 'int', 'sector-count': 'int' } } 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': 'int' } }
## ##
# @QUORUM_REPORT_BAD # @QUORUM_REPORT_BAD
@ -309,13 +309,13 @@
# #
# @sector-num: number of the first sector of the failed read operation # @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 # Since: 2.0
## ##
{ 'event': 'QUORUM_REPORT_BAD', { 'event': 'QUORUM_REPORT_BAD',
'data': { '*error': 'str', 'node-name': 'str', 'data': { '*error': 'str', 'node-name': 'str',
'sector-num': 'int', 'sector-count': 'int' } } 'sector-num': 'int', 'sectors-count': 'int' } }
## ##
# @VSERPORT_CHANGE # @VSERPORT_CHANGE