[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/14] Revert "hmp: info spice: take out webdav"
From: |
Markus Armbruster |
Subject: |
[PATCH v2 04/14] Revert "hmp: info spice: take out webdav" |
Date: |
Fri, 2 Dec 2022 11:05:02 +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>
---
monitor/hmp-cmds.c | 5 -----
1 file changed, 5 deletions(-)
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);
--
2.37.3
- [PATCH v2 00/14] ui: Move and clean up monitor command code, Markus Armbruster, 2022/12/02
- [PATCH v2 03/14] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2022/12/02
- [PATCH v2 01/14] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2022/12/02
- [PATCH v2 04/14] Revert "hmp: info spice: take out webdav",
Markus Armbruster <=
- [PATCH v2 02/14] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2022/12/02
- [PATCH v2 14/14] ui: Reduce nesting in hmp_change_vnc() slightly, Markus Armbruster, 2022/12/02
- [PATCH v2 12/14] ui: Improve "change vnc" error reporting, Markus Armbruster, 2022/12/02
- [PATCH v2 10/14] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2022/12/02
- [PATCH v2 07/14] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2022/12/02
- [PATCH v2 08/14] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2022/12/02