Message ID | 20221202100512.4161901-5-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Series | ui: Move and clean up monitor command code | expand |
On Fri, Dec 02, 2022 at 11:05:02AM +0100, Markus Armbruster wrote: > 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> > --- > monitor/hmp-cmds.c | 5 ----- > 1 file changed, 5 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index a7c9ae2520..7360ed71a6 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -626,12 +626,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);
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> --- monitor/hmp-cmds.c | 5 ----- 1 file changed, 5 deletions(-)