qapi: Delete unwanted indentation of top-level expressions
PATCH 1/1 qapi: Delete unwanted indentation of top-level expressions
Signed-off-by Markus Armbruster <[email protected]>
--- qapi/block-core.json | 24 ++++++++++++------------ qapi/ui.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-)
qapi/block-core.json +12 -12
@@ -1847,8 +1847,8 @@ # # Since: 4.0 ## - { 'enum': 'BlockPermission', - 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', +{ 'enum': 'BlockPermission', + 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', 'graph-mod' ] } ## # @XDbgBlockGraphEdge:
@@ -2155,8 +2155,8 @@ # <- { "return": {} } # ## - { 'command': 'block-dirty-bitmap-enable', - 'data': 'BlockDirtyBitmap' } +{ 'command': 'block-dirty-bitmap-enable', + 'data': 'BlockDirtyBitmap' } ## # @block-dirty-bitmap-disable:
@@ -2176,8 +2176,8 @@ # <- { "return": {} } # ## - { 'command': 'block-dirty-bitmap-disable', - 'data': 'BlockDirtyBitmap' } +{ 'command': 'block-dirty-bitmap-disable', + 'data': 'BlockDirtyBitmap' } ## # @block-dirty-bitmap-merge:
@@ -2208,8 +2208,8 @@ # <- { "return": {} } # ## - { 'command': 'block-dirty-bitmap-merge', - 'data': 'BlockDirtyBitmapMerge' } +{ 'command': 'block-dirty-bitmap-merge', + 'data': 'BlockDirtyBitmapMerge' } ## # @BlockDirtyBitmapSha256:
@@ -2220,8 +2220,8 @@ # # Since: 2.10 ## - { 'struct': 'BlockDirtyBitmapSha256', - 'data': {'sha256': 'str'} } +{ 'struct': 'BlockDirtyBitmapSha256', + 'data': {'sha256': 'str'} } ## # @x-debug-block-dirty-bitmap-sha256:
@@ -2235,8 +2235,8 @@ # # Since: 2.10 ## - { 'command': 'x-debug-block-dirty-bitmap-sha256', - 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' } +{ 'command': 'x-debug-block-dirty-bitmap-sha256', + 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' } ## # @blockdev-mirror:
qapi/ui.json +2 -2
@@ -1081,8 +1081,8 @@ # Since: 3.0 # ## - { 'enum' : 'DisplayGLMode', - 'data' : [ 'off', 'on', 'core', 'es' ] } +{ 'enum' : 'DisplayGLMode', + 'data' : [ 'off', 'on', 'core', 'es' ] } ## # @DisplayCurses:
Signature · 1 line
2.26.2
Quoted 11 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- qapi/block-core.json | 24 ++++++++++++------------ qapi/ui.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-)qapi/block-core.json +0
-0
qapi/block-core.json line 1852
Quoted 8 lines
qapi/block-core.json +2
-2@@ -1847,8 +1847,8 @@ # # Since: 4.0 ## - { 'enum': 'BlockPermission', - 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', +{ 'enum': 'BlockPermission', + 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', 'graph-mod' ] }
Do we want to keep the alignment at the opening parenthesis here?
Max
Quoted 7 lines · Max Reitz
Quoted 6 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- qapi/block-core.json | 24 ++++++++++++------------ qapi/ui.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-)
Quoted 15 lines
qapi/block-core.json line 1852
Quoted 13 lines
qapi/block-core.json +2
-2@@ -1847,8 +1847,8 @@ # # Since: 4.0 ## - { 'enum': 'BlockPermission', - 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', +{ 'enum': 'BlockPermission', + 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', 'graph-mod' ] }Do we want to keep the alignment at the opening parenthesis here?
Yes, we do. Thanks!
Quoted 9 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- qapi/block-core.json | 24 ++++++++++++------------ qapi/ui.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-)+++
b/qapi/ui.json
qapi/ui.json line 1085
Quoted 7 lines
qapi/ui.json +2
-2@@ -1081,8 +1081,8 @@ # Since: 3.0 # ## - { 'enum' : 'DisplayGLMode', - 'data' : [ 'off', 'on', 'core', 'es' ] } +{ 'enum' : 'DisplayGLMode', + 'data' : [ 'off', 'on', 'core', 'es' ] }
We are really inconsistent on whether we use space before ':'. Oh well, not the problem of this patch.
With the one additional line reindented as covered by Max' review,
Reviewed-by Eric Blake <[email protected]>
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Queued.