[Qemu-devel] [PATCH] qapi: Change back sector-count to sectors-count in quorum QAPI events.

[Qemu-devel] [PATCH] qapi: Change back sector-count to sectors-count in quorum QAPI events.

[Benoît 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 permutation.

Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 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 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 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': '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
-- 
2.0.0

Re: [Qemu-devel] [PATCH for 2.1] qapi: Change back sector-count to sectors-count in quorum QAPI events.

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 932 bytes --]

On 06/30/2014 09:05 AM, Benoît Canet wrote:
> fe069d9d had aligned code and documentation while dropping the s from the
> actual JSON output. Fix that.

Uggh. I missed that in my review (I was obviously less careful in the
second half of the series than in the first half).  It's annoying that
we have an inconsistency, but back-compat demands that we preserve the
spelling difference between the parameters.  This needs to go in to
avoid a regression.

> 
> This also fix test/qemu-iotest/081 since the missing s was causing a permutation.
> 
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  docs/qmp/qmp-events.txt | 26 +++++++++++++-------------
>  qapi/event.json         |  8 ++++----
>  2 files changed, 17 insertions(+), 17 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH] qapi: Change back sector-count to sectors-count in quorum QAPI events.

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

On Mon, Jun 30, 2014 at 05:05:41PM +0200, Benoît Canet wrote:
> 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>
> ---
>  docs/qmp/qmp-events.txt | 26 +++++++++++++-------------
>  qapi/event.json         |  8 ++++----
>  2 files changed, 17 insertions(+), 17 deletions(-)

Fixes qemu-iotests 081.

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]