Revert "hmp: info spice: take out webdav"
authorMarkus Armbruster <armbru@redhat.com>
Mon, 9 Jan 2023 19:03:08 +0000 (20:03 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 19 Jan 2023 12:30:01 +0000 (13:30 +0100)
This reverts commit 7c6044a94e52db8aef9a71d616c7a0914adb71ab.

We had to take it out because SPICE_CHANNEL_WEBDAV requires
spice-protocol 0.12.7, but we had only 0.12.3.  We have 0.14.0 now, so
put it back in.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230109190321.1056914-5-armbru@redhat.com>

monitor/hmp-cmds.c

index 9947ff0b453c8a6f91e6b9456396fe7b43866fd4..67e39f408ec6c6c6a9c142a4798023733dfa61cc 100644 (file)
@@ -622,12 +622,7 @@ 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);