[Spice-devel] hmp: info spice: take out webdav

Submitted by Gerd Hoffmann on March 3, 2015, 8:31 a.m.

Details

Message ID 1425371482-25590-1-git-send-email-kraxel@redhat.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Gerd Hoffmann March 3, 2015, 8:31 a.m.
Obvious suggestion for the next spice-protocol
release: Add some way to #ifdef new stuff.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hmp.c | 5 +++++
 1 file changed, 5 insertions(+)

Patch hide | download patch | download mbox

diff --git a/hmp.c b/hmp.c
index eacfb1b..71c28bc 100644
--- a/hmp.c
+++ b/hmp.c
@@ -561,7 +561,12 @@  void hmp_info_spice(Monitor *mon, const QDict *qdict)
         [SPICE_CHANNEL_SMARTCARD] = "smartcard",
         [SPICE_CHANNEL_USBREDIR] = "usbredir",
         [SPICE_CHANNEL_PORT] = "port",
+#if 0
+        /* minimum spice-protocol is 0.12.3, webdav was added in 0.12.7,
+         * no easy way to #ifdef (SPICE_CHANNEL_* is a enum).  Disable
+         * as quick fix for build failures with older versions. */
         [SPICE_CHANNEL_WEBDAV] = "webdav",
+#endif
     };
 
     info = qmp_query_spice(NULL);

Comments

On 03/03/2015 03:31 AM, Gerd Hoffmann wrote:
> Obvious suggestion for the next spice-protocol
> release: Add some way to #ifdef new stuff.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hmp.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/hmp.c b/hmp.c
> index eacfb1b..71c28bc 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -561,7 +561,12 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
>          [SPICE_CHANNEL_SMARTCARD] = "smartcard",
>          [SPICE_CHANNEL_USBREDIR] = "usbredir",
>          [SPICE_CHANNEL_PORT] = "port",
> +#if 0
> +        /* minimum spice-protocol is 0.12.3, webdav was added in 0.12.7,
> +         * no easy way to #ifdef (SPICE_CHANNEL_* is a enum).  Disable
> +         * as quick fix for build failures with older versions. */
>          [SPICE_CHANNEL_WEBDAV] = "webdav",
> +#endif
>      };
>  
>      info = qmp_query_spice(NULL);
> 

Hmm sorry about that.

Reviewed-by: Cole Robinson <crobinso@redhat.com>

- Cole