[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 20/24] qapi: Change back sector-count to sect
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.1 20/24] qapi: Change back sector-count to sectors-count in quorum QAPI events. |
Date: |
Tue, 1 Jul 2014 10:48:53 +0200 |
From: BenoƮt Canet <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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
--
1.9.3
- [Qemu-devel] [PULL for-2.1 12/24] virtio-blk: remove need for explicit x-data-plane=on option, (continued)
- [Qemu-devel] [PULL for-2.1 12/24] virtio-blk: remove need for explicit x-data-plane=on option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 13/24] qemu-img create: add 'nocow' option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 14/24] iotests: Simplify qemu-iotests-quick.sh, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 15/24] iotests: Add qemu tests to quick group, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 17/24] block: make 'top' argument to block-commit optional, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 16/24] iotests: Add more tests to quick group, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 18/24] block: simplify bdrv_find_base() and bdrv_find_overlay(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 19/24] block/cow: Avoid use of uninitialized cow_bs in error path, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 20/24] qapi: Change back sector-count to sectors-count in quorum QAPI events.,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.1 21/24] block: add QAPI command to allow live backing file change, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 23/24] block: extend block-commit to accept a string for the backing file, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 22/24] block: add helper function to determine if a BDS is in a chain, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 24/24] block: add backing-file option to block-stream, Stefan Hajnoczi, 2014/07/01
- Re: [Qemu-devel] [PULL for-2.1 00/24] Block patches, Peter Maydell, 2014/07/01