Commit b0ddeba2 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qapi: break long lines at 'data' member 



Let's break the line before 'data'. While at it, improve a bit
indentation/spacing. (I removed some alignment which are not helping
much readability and become quickly inconsistent)

Suggested-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181208111606.8505-26-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 57516863

qapi/block-core.json

+8 −5
Original line number Diff line number Diff line
@@ -1143,8 +1143,10 @@ 
# This command is now obsolete and will always return an error since 2.10

#

##

{ 'command': 'block_passwd', 'data': {'*device': 'str',

                                      '*node-name': 'str', 'password': 'str'} }

{ 'command': 'block_passwd',

  'data': { '*device': 'str',

            '*node-name': 'str',

            'password': 'str' } }



##

# @block_resize:
@@ -1171,7 +1173,8 @@ 
# <- { "return": {} }

#

##

{ 'command': 'block_resize', 'data': { '*device': 'str',

{ 'command': 'block_resize',

  'data': { '*device': 'str',

            '*node-name': 'str',

            'size': 'int' } }

qapi/char.json

+79 −59
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
#

# Since: 0.14.0

##

{ 'struct': 'ChardevInfo', 'data': {'label': 'str',

{ 'struct': 'ChardevInfo',

  'data': { 'label': 'str',

            'filename': 'str',

            'frontend-open': 'bool' } }
@@ -152,7 +153,8 @@ 
#

##

{ 'command': 'ringbuf-write',

  'data': {'device': 'str', 'data': 'str',

  'data': { 'device': 'str',

            'data': 'str',

           '*format': 'DataFormat'} }



##
@@ -202,7 +204,8 @@ 
#

# Since: 2.6

##

{ 'struct': 'ChardevCommon', 'data': { '*logfile': 'str',

{ 'struct': 'ChardevCommon',

  'data': { '*logfile': 'str',

            '*logappend': 'bool' } }



##
@@ -217,7 +220,8 @@ 
#

# Since: 1.4

##

{ 'struct': 'ChardevFile', 'data': { '*in' : 'str',

{ 'struct': 'ChardevFile',

  'data': { '*in': 'str',

            'out': 'str',

            '*append': 'bool' },

  'base': 'ChardevCommon' }
@@ -232,7 +236,8 @@ 
#

# Since: 1.4

##

{ 'struct': 'ChardevHostdev', 'data': { 'device' : 'str' },

{ 'struct': 'ChardevHostdev',

  'data': { 'device': 'str' },

  'base': 'ChardevCommon' }



##
@@ -260,7 +265,8 @@ 
#

# Since: 1.4

##

{ 'struct': 'ChardevSocket', 'data': { 'addr'       : 'SocketAddressLegacy',

{ 'struct': 'ChardevSocket',

  'data': { 'addr': 'SocketAddressLegacy',

            '*tls-creds': 'str',

            '*server': 'bool',

            '*wait': 'bool',
@@ -281,7 +287,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevUdp', 'data': { 'remote' : 'SocketAddressLegacy',

{ 'struct': 'ChardevUdp',

  'data': { 'remote': 'SocketAddressLegacy',

            '*local': 'SocketAddressLegacy' },

  'base': 'ChardevCommon' }
@@ -294,7 +301,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevMux', 'data': { 'chardev' : 'str' },

{ 'struct': 'ChardevMux',

  'data': { 'chardev': 'str' },

  'base': 'ChardevCommon' }



##
@@ -308,7 +316,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevStdio', 'data': { '*signal' : 'bool' },

{ 'struct': 'ChardevStdio',

  'data': { '*signal': 'bool' },

  'base': 'ChardevCommon' }
@@ -321,7 +330,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevSpiceChannel', 'data': { 'type'  : 'str' },

{ 'struct': 'ChardevSpiceChannel',

  'data': { 'type': 'str' },

  'base': 'ChardevCommon' }

# TODO: 'if': 'defined(CONFIG_SPICE)'
@@ -334,7 +344,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevSpicePort', 'data': { 'fqdn'  : 'str' },

{ 'struct': 'ChardevSpicePort',

  'data': { 'fqdn': 'str' },

  'base': 'ChardevCommon' }

# TODO: 'if': 'defined(CONFIG_SPICE)'
@@ -350,7 +361,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevVC', 'data': { '*width'  : 'int',

{ 'struct': 'ChardevVC',

  'data': { '*width': 'int',

            '*height': 'int',

            '*cols': 'int',

            '*rows': 'int' },
@@ -365,7 +377,8 @@ 
#

# Since: 1.5

##

{ 'struct': 'ChardevRingbuf', 'data': { '*size'  : 'int' },

{ 'struct': 'ChardevRingbuf',

  'data': { '*size': 'int' },

  'base': 'ChardevCommon' }



##
@@ -375,7 +388,8 @@ 
#

# Since: 1.4 (testdev since 2.2, wctablet since 2.9)

##

{ 'union': 'ChardevBackend', 'data': { 'file'   : 'ChardevFile',

{ 'union': 'ChardevBackend',

  'data': { 'file': 'ChardevFile',

            'serial': 'ChardevHostdev',

            'parallel': 'ChardevHostdev',

            'pipe': 'ChardevHostdev',
@@ -409,7 +423,8 @@ 
#

# Since: 1.4

##

{ 'struct' : 'ChardevReturn', 'data': { '*pty' : 'str' } }

{ 'struct' : 'ChardevReturn',

  'data': { '*pty': 'str' } }



##

# @chardev-add:
@@ -442,7 +457,8 @@ 
# <- { "return": { "pty" : "/dev/pty/42" } }

#

##

{ 'command': 'chardev-add', 'data': {'id'      : 'str',

{ 'command': 'chardev-add',

  'data': { 'id': 'str',

            'backend': 'ChardevBackend' },

  'returns': 'ChardevReturn' }
@@ -482,7 +498,8 @@ 
# <- {"return": {}}

#

##

{ 'command': 'chardev-change', 'data': {'id'      : 'str',

{ 'command': 'chardev-change',

  'data': { 'id': 'str',

            'backend': 'ChardevBackend' },

  'returns': 'ChardevReturn' }
@@ -503,7 +520,8 @@ 
# <- { "return": {} }

#

##

{ 'command': 'chardev-remove', 'data': {'id': 'str'} }

{ 'command': 'chardev-remove',

  'data': { 'id': 'str' } }



##

# @chardev-send-break:
@@ -522,7 +540,8 @@ 
# <- { "return": {} }

#

##

{ 'command': 'chardev-send-break', 'data': {'id': 'str'} }

{ 'command': 'chardev-send-break',

  'data': { 'id': 'str' } }



##

# @VSERPORT_CHANGE:
@@ -543,4 +562,5 @@ 
#

##

{ 'event': 'VSERPORT_CHANGE',

  'data': { 'id': 'str', 'open': 'bool' } }
 
  'data': { 'id': 'str',

            'open': 'bool' } }

qapi/migration.json

+2 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,8 @@ 
#

# Since: 3.0

##

{ 'command': 'migrate-recover', 'data': { 'uri': 'str' },

{ 'command': 'migrate-recover',

  'data': { 'uri': 'str' },

  'allow-oob': true }



##

qapi/misc.json

+5 −2
Original line number Diff line number Diff line
@@ -2385,7 +2385,9 @@ 
# <- { "return": { "fdset-id": 1, "fd": 3 } }

#

##

{ 'command': 'add-fd', 'data': {'*fdset-id': 'int', '*opaque': 'str'},

{ 'command': 'add-fd',

  'data': { '*fdset-id': 'int',

            '*opaque': 'str' },

  'returns': 'AddfdInfo' }



##
@@ -2657,7 +2659,8 @@ 
#    }

#

##

{'command': 'query-command-line-options', 'data': { '*option': 'str' },

{'command': 'query-command-line-options',

 'data': { '*option': 'str' },

 'returns': ['CommandLineOptionInfo'],

 'allow-preconfig': true }

qapi/net.json

+2 −1
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ 
#    }

#

##

{ 'command': 'query-rx-filter', 'data': { '*name': 'str' },

{ 'command': 'query-rx-filter',

  'data': { '*name': 'str' },

  'returns': ['RxFilterInfo'] }



##