From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1tlJ-0000B5-3d for qemu-devel@nongnu.org; Tue, 01 Jul 2014 04:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1tlD-0006Ns-J2 for qemu-devel@nongnu.org; Tue, 01 Jul 2014 04:50:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1tlD-0006NP-Bp for qemu-devel@nongnu.org; Tue, 01 Jul 2014 04:49:55 -0400 From: Stefan Hajnoczi Date: Tue, 1 Jul 2014 10:48:53 +0200 Message-Id: <1404204537-5082-21-git-send-email-stefanha@redhat.com> In-Reply-To: <1404204537-5082-1-git-send-email-stefanha@redhat.com> References: <1404204537-5082-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.1 20/24] qapi: Change back sector-count to sectors-count in quorum QAPI events. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , Peter Maydell , Benoit Canet , Stefan Hajnoczi From: Beno=C3=AEt Canet 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 perm= utation. Signed-off-by: Benoit Canet Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- docs/qmp/qmp-events.txt | 26 +++++++++++++------------- 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 44be891..4a6c2a2 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 e= stablish a quorum. =20 Data: =20 -- "reference": device name if defined else node name. -- "sector-num": Number of the first sector of the failed read operatio= n. -- "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 operati= on. +- "sectors-count": Failed read operation sector count. =20 Example: =20 { "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 } } =20 QUORUM_REPORT_BAD @@ -267,19 +267,19 @@ Emitted to report a corruption of a Quorum file. =20 Data: =20 -- "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 t= ry 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 operatio= n. -- "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 tha= t 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 operati= on. +- "sectors-count": Failed read operation sector count. =20 Example: =20 { "event": "QUORUM_REPORT_BAD", - "data": { "node-name": "1.raw", "sector-num": 345435, "sector-count= ": 5 }, + "data": { "node-name": "1.raw", "sector-num": 345435, "sectors-coun= t": 5 }, "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } =20 RESET diff --git a/qapi/event.json b/qapi/event.json index ff97aeb..c51dc49 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': 'in= t' } } + 'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': 'i= nt' } } =20 ## # @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' } } =20 ## # @VSERPORT_CHANGE --=20 1.9.3