[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 21/22] qapi: add more conditions to SPICE
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v8 21/22] qapi: add more conditions to SPICE |
Date: |
Thu, 13 Dec 2018 16:37:23 +0400 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
qapi/char.json | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/qapi/char.json b/qapi/char.json
index 24628331ec..77ed847972 100644
--- a/qapi/char.json
+++ b/qapi/char.json
@@ -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
--
2.20.0
- [Qemu-devel] [PATCH v8 15/22] qapi: add 'if' to union members, (continued)
- [Qemu-devel] [PATCH v8 15/22] qapi: add 'if' to union members, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 16/22] qapi: add 'if' to alternate members, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 17/22] qapi: add #if conditions to generated code members, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 18/22] qapi: add 'If:' condition to enum values documentation, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 19/22] qapi: add 'If:' condition to struct members documentation, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 20/22] qapi: add condition to variants documentation, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 22/22] qapi: add conditions to REPLICATION type/commands on the schema, Marc-André Lureau, 2018/12/13
- [Qemu-devel] [PATCH v8 21/22] qapi: add more conditions to SPICE,
Marc-André Lureau <=
- Re: [Qemu-devel] [PATCH v8 00/22] qapi: add #if pre-processor conditions to generated code (part 2), Markus Armbruster, 2018/12/13
- Re: [Qemu-devel] [PATCH v8 00/22] qapi: add #if pre-processor conditions to generated code (part 2), Markus Armbruster, 2018/12/13