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

qapi: add more conditions to SPICE 



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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20181213123724.4866-22-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 01ae9cc2

qapi/char.json

+8 −8
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ 
##

{ 'struct': 'ChardevSpiceChannel',

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

  'base': 'ChardevCommon' }

# TODO: 'if': 'defined(CONFIG_SPICE)'

  'base': 'ChardevCommon',

  'if': 'defined(CONFIG_SPICE)' }



##

# @ChardevSpicePort:
@@ -346,8 +346,8 @@ 
##

{ 'struct': 'ChardevSpicePort',

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

  'base': 'ChardevCommon' }

# TODO: 'if': 'defined(CONFIG_SPICE)'

  'base': 'ChardevCommon',

  'if': 'defined(CONFIG_SPICE)' }



##

# @ChardevVC:
@@ -404,10 +404,10 @@ 
            'testdev': 'ChardevCommon',

            'stdio': 'ChardevStdio',

            'console': 'ChardevCommon',

            'spicevmc': 'ChardevSpiceChannel',

# TODO: { 'type': 'ChardevSpiceChannel', 'if': 'defined(CONFIG_SPICE)' },

            'spiceport': 'ChardevSpicePort',

# TODO: { 'type': 'ChardevSpicePort', 'if': 'defined(CONFIG_SPICE)' },

            'spicevmc': { 'type': 'ChardevSpiceChannel',

                          'if': 'defined(CONFIG_SPICE)' },

            'spiceport': { 'type': 'ChardevSpicePort',

                           'if': 'defined(CONFIG_SPICE)' },

            'vc': 'ChardevVC',

            'ringbuf': 'ChardevRingbuf',

            # next one is just for compatibility