OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: add more conditions to SPICE

Browse Source 
Now that member can be made conditional, let's make SPICE chardev
conditional:

* spiceport, spicevmc

  Before and after the patch for !CONFIG_SPICE, the error is the
  same ('spiceport' is not a valid char driver name).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20181213123724.4866-22-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-13 16:37:23 +04:00 committed by Markus Armbruster
parent 01ae9cc254
commit fd9dda3b70
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qapi/char.json
View File

@ -332,8 +332,8 @@
## ##
{ 'struct': 'ChardevSpiceChannel', { 'struct': 'ChardevSpiceChannel',
'data': { 'type': 'str' }, 'data': { 'type': 'str' },
'base': 'ChardevCommon' } 'base': 'ChardevCommon',
# TODO: 'if': 'defined(CONFIG_SPICE)' 'if': 'defined(CONFIG_SPICE)' }
## ##
# @ChardevSpicePort: # @ChardevSpicePort:
@ -346,8 +346,8 @@
## ##
{ 'struct': 'ChardevSpicePort', { 'struct': 'ChardevSpicePort',
'data': { 'fqdn': 'str' }, 'data': { 'fqdn': 'str' },
'base': 'ChardevCommon' } 'base': 'ChardevCommon',
# TODO: 'if': 'defined(CONFIG_SPICE)' 'if': 'defined(CONFIG_SPICE)' }
## ##
# @ChardevVC: # @ChardevVC:
@ -404,10 +404,10 @@
'testdev': 'ChardevCommon', 'testdev': 'ChardevCommon',
'stdio': 'ChardevStdio', 'stdio': 'ChardevStdio',
'console': 'ChardevCommon', 'console': 'ChardevCommon',
'spicevmc': 'ChardevSpiceChannel', 'spicevmc': { 'type': 'ChardevSpiceChannel',
# TODO: { 'type': 'ChardevSpiceChannel', 'if': 'defined(CONFIG_SPICE)' }, 'if': 'defined(CONFIG_SPICE)' },
'spiceport': 'ChardevSpicePort', 'spiceport': { 'type': 'ChardevSpicePort',
# TODO: { 'type': 'ChardevSpicePort', 'if': 'defined(CONFIG_SPICE)' }, 'if': 'defined(CONFIG_SPICE)' },
'vc': 'ChardevVC', 'vc': 'ChardevVC',
'ringbuf': 'ChardevRingbuf', 'ringbuf': 'ChardevRingbuf',
# next one is just for compatibility # next one is just for compatibility