qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 04/17] Revert "hmp: info spice: take out webdav"
Date: Thu, 19 Jan 2023 14:27:00 +0100	[thread overview]
Message-ID: <20230119132713.3493556-5-armbru@redhat.com> (raw)
In-Reply-To: <20230119132713.3493556-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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230109190321.1056914-5-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 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



  parent reply	other threads:[~2023-01-19 13:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-19 13:26 [PULL 00/17] Monitor patches for 2023-01-19 Markus Armbruster
2023-01-19 13:26 ` [PULL 01/17] ui: Check numeric part of expire_password argument @time properly Markus Armbruster
2023-01-19 13:26 ` [PULL 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey Markus Armbruster
2023-01-19 13:26 ` [PULL 03/17] ui/spice: Require spice-protocol >= 0.14.0 Markus Armbruster
2023-01-19 13:27 ` Markus Armbruster [this message]
2023-01-19 13:27 ` [PULL 05/17] ui/spice: Require spice-server " Markus Armbruster
2023-01-19 13:27 ` [PULL 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop Markus Armbruster
2023-01-19 13:27 ` [PULL 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage Markus Armbruster
2023-01-19 13:27 ` [PULL 08/17] ui: Clean up a few things checkpatch.pl would flag later on Markus Armbruster
2023-01-19 13:27 ` [PULL 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 12/17] ui: Improve "change vnc" error reporting Markus Armbruster
2023-01-19 13:27 ` [PULL 13/17] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c Markus Armbruster
2023-01-19 13:27 ` [PULL 14/17] ui: Reduce nesting in hmp_change_vnc() slightly Markus Armbruster
2023-01-19 13:27 ` [PULL 15/17] ui: Don't check for mode change after mouse_set error Markus Armbruster
2023-01-19 13:27 ` [PULL 16/17] ui: Split hmp_mouse_set() and move the HMP part to ui/ Markus Armbruster
2023-01-19 13:27 ` [PULL 17/17] ui: Simplify control flow in qemu_mouse_set() Markus Armbruster
2023-01-20 13:17 ` [PULL 00/17] Monitor patches for 2023-01-19 Peter Maydell

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=20230119132713.3493556-5-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=peter.maydell@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).