[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/17] Revert "hmp: info spice: take out webdav"
From: |
Markus Armbruster |
Subject: |
[PATCH v4 04/17] Revert "hmp: info spice: take out webdav" |
Date: |
Mon, 9 Jan 2023 20:03:08 +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>
---
monitor/hmp-cmds.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 9947ff0b45..67e39f408e 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -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);
--
2.39.0
- [PATCH v4 00/17] ui: Move and clean up monitor command code, Markus Armbruster, 2023/01/09
- [PATCH v4 14/17] ui: Reduce nesting in hmp_change_vnc() slightly, Markus Armbruster, 2023/01/09
- [PATCH v4 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2023/01/09
- [PATCH v4 05/17] ui/spice: Require spice-server >= 0.14.0, Markus Armbruster, 2023/01/09
- [PATCH v4 04/17] Revert "hmp: info spice: take out webdav",
Markus Armbruster <=
- [PATCH v4 16/17] ui: Split hmp_mouse_set() and move the HMP part to ui/, Markus Armbruster, 2023/01/09
- [PATCH v4 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2023/01/09
- [PATCH v4 08/17] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2023/01/09
- [PATCH v4 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set(), Markus Armbruster, 2023/01/09
- [PATCH v4 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/09