Commit 4e855baa authored by Benoît Canet's avatar Benoît Canet Committed by Stefan Hajnoczi
Browse files

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: default avatarBenoit Canet <benoit@irqsave.net>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 6764579f

docs/qmp/qmp-events.txt

+13 −13
Original line number Diff line number Diff line
@@ -252,12 +252,12 @@ 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.

- "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
@@ -274,12 +274,12 @@ Data: 
                   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.

- "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

qapi/event.json

+4 −4
Original line number Diff line number Diff line
@@ -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