From nobody Tue Feb 10 12:39:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674134968; cv=none; d=zohomail.com; s=zohoarc; b=PMaiuxVAxBITjEvG6Hy83UlqgPFOaciKOWTschf67EHYyU6Flvlmsa7PmqvLVm9RdT1tqtqEl7vpq+34XH4lLqHokTdEUpn7AM2cyfsfLuNZU1YsRjxloaFWfFvOlZyt5hI3puS/3fb9Lo7AWLYSCsRzsRRxXynSTSHbqBVBlug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674134968; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xLm6IsVhlrtzGfoVZhY9vYsYrlTeajP4fhZ9jGQSaUE=; b=nUVkp6jq/Syv4jGytMtSjsmoJCF5ozuc2k8u0YGcKOE36ga1Y6oXkd6jAx9A5TTjxKB/rLn3hpXfDW97Mhf0tRI35XnXVItzPA5FNIcrQnVqk1KSOoCUgO3IaAqiMp/FxyI84Ui0Y4JEE0pW3yCb51d9olwrk6g1HsBymrN73A8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674134968813178.28487074923123; Thu, 19 Jan 2023 05:29:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIUxJ-0005vm-N9; Thu, 19 Jan 2023 08:27:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIUx3-0005qJ-89 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 08:27:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIUww-0008Bx-Fu for qemu-devel@nongnu.org; Thu, 19 Jan 2023 08:27:32 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-261-KyYB7tFhNiOeD-TIaqHK2g-1; Thu, 19 Jan 2023 08:27:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D0D91C0A5AE; Thu, 19 Jan 2023 13:27:14 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7059DC158BA; Thu, 19 Jan 2023 13:27:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5595F21E6681; Thu, 19 Jan 2023 14:27:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674134836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xLm6IsVhlrtzGfoVZhY9vYsYrlTeajP4fhZ9jGQSaUE=; b=BOxxDZrccCM176Mk1RJX3yefXj2thb0hsVf2ia90in/BRCsnFCNUpjwrXs/7x/EEgTbvep rh2P6WiZo0HTKG1GwBQtzhF1ouxhBqLrNIh8J7tnytp0ZcoEZbEXZ6WiFukZBgjEvg2W9l 8jYWBeYs5SJVNK00tl6KO3UwDGUXU7k= X-MC-Unique: KyYB7tFhNiOeD-TIaqHK2g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 04/17] Revert "hmp: info spice: take out webdav" Date: Thu, 19 Jan 2023 14:27:00 +0100 Message-Id: <20230119132713.3493556-5-armbru@redhat.com> In-Reply-To: <20230119132713.3493556-1-armbru@redhat.com> References: <20230119132713.3493556-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674134971684100003 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 Reviewed-by: Daniel P. Berrang=C3=A9 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] =3D "smartcard", [SPICE_CHANNEL_USBREDIR] =3D "usbredir", [SPICE_CHANNEL_PORT] =3D "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] =3D "webdav", -#endif }; =20 info =3D qmp_query_spice(NULL); --=20 2.39.0