From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kraxel@redhat.com, dgilbert@redhat.com, berrange@redhat.com,
philmd@linaro.org
Subject: [PATCH v2 04/14] Revert "hmp: info spice: take out webdav"
Date: Fri, 2 Dec 2022 11:05:02 +0100 [thread overview]
Message-ID: <20221202100512.4161901-5-armbru@redhat.com> (raw)
In-Reply-To: <20221202100512.4161901-1-armbru@redhat.com>
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
next prev parent reply other threads:[~2022-12-02 10:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-02 10:04 [PATCH v2 00/14] ui: Move and clean up monitor command code Markus Armbruster
2022-12-02 10:04 ` [PATCH v2 01/14] ui: Check numeric part of expire_password argument @time properly Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 02/14] ui: Fix silent truncation of numeric keys in HMP sendkey Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 03/14] ui/spice: Require spice-protocol >= 0.14.0 Markus Armbruster
2022-12-02 10:14 ` Philippe Mathieu-Daudé
2022-12-05 11:09 ` Daniel P. Berrangé
2022-12-02 10:05 ` Markus Armbruster [this message]
2022-12-05 11:09 ` [PATCH v2 04/14] Revert "hmp: info spice: take out webdav" Daniel P. Berrangé
2022-12-02 10:05 ` [PATCH v2 05/14] ui/spice: Require spice-server >= 0.14.0 Markus Armbruster
2022-12-02 10:16 ` Philippe Mathieu-Daudé
2022-12-05 11:11 ` Daniel P. Berrangé
2022-12-02 10:05 ` [PATCH v2 06/14] ui/spice: QXLInterface method set_mm_time() is now dead, drop Markus Armbruster
2022-12-02 10:17 ` Philippe Mathieu-Daudé
2022-12-05 11:11 ` Daniel P. Berrangé
2022-12-02 10:05 ` [PATCH v2 07/14] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage Markus Armbruster
2022-12-02 10:13 ` Philippe Mathieu-Daudé
2022-12-02 10:05 ` [PATCH v2 08/14] ui: Clean up a few things checkpatch.pl would flag later on Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 09/14] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c Markus Armbruster
2022-12-02 10:18 ` Philippe Mathieu-Daudé
2022-12-02 10:05 ` [PATCH v2 10/14] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c Markus Armbruster
2022-12-02 10:57 ` Philippe Mathieu-Daudé
2022-12-02 15:09 ` Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 11/14] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c Markus Armbruster
2022-12-12 10:08 ` Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 12/14] ui: Improve "change vnc" error reporting Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 13/14] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c Markus Armbruster
2022-12-02 10:05 ` [PATCH v2 14/14] ui: Reduce nesting in hmp_change_vnc() slightly Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221202100512.4161901-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).