From nobody Mon Feb 9 12:11:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632411537; cv=none; d=zohomail.com; s=zohoarc; b=PJ78EWRBOWxgJdMg7Dg5ewNO2VoxpurR8UPwCujmvbodmmQfTLLe05ynFJGqYNVPPm8LNUJR3XPr2DM63/pC2NWp3c2THgwMDGCqm4BwiXEPXlhWAQZSN1qz0NUE88btu6qoG0ajh5TFK06tiSHZw35dvvSEXI0z6iLRX7TXNqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632411537; h=Content-Type:Content-Transfer-Encoding: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=D9FFfBf18nMw+W68Y2dVHUOCAQjyIvtT6Yv2Kyhq3UQ=; b=KkNzz3kNyuMJU8BP5IIgwabTofIFkLhE/eDpH+ZzEwyhGPtcroUFvZ3N4QApObeqFRo+yIRDJR+ih4AroOnM3ZFxS/VCVsdz92SR6GxwU7nLkjTy6HhCctKrYM4dGvDQVE6aGn9LMKziWJqtViFUTFAyxZ+lwVs7zJ9BmMA6lxQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1632411537304912.0704853165146; Thu, 23 Sep 2021 08:38:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-UcZlB5KfNr6R3eBcmRsZHw-1; Thu, 23 Sep 2021 11:38:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F28D802C92; Thu, 23 Sep 2021 15:38:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5EE39652B2; Thu, 23 Sep 2021 15:38:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F16521806D04; Thu, 23 Sep 2021 15:38:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18NFchAJ000968 for ; Thu, 23 Sep 2021 11:38:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F4CC102482F; Thu, 23 Sep 2021 15:38:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id A17A1100EBB8 for ; Thu, 23 Sep 2021 15:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632411536; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D9FFfBf18nMw+W68Y2dVHUOCAQjyIvtT6Yv2Kyhq3UQ=; b=QT1S7HaaRNFqpN6LpkpnSr0OrWlT/hrwB8AeBx4NSH8t7tOlyvys+xghzB10mB80QLMmJV EoP5F/Zg1xAeZ73KjjQGA1M/aK8ygmFlSS+uH3s9DAQ4plEPPas+DyF38Lu7HOzFzHMpVd 44nWwMFpPzA1xSjXIm7xwi5fS0uzkdQ= X-MC-Unique: UcZlB5KfNr6R3eBcmRsZHw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/14] qemu: validate: Always assume QEMU_CAPS_SPICE_FILE_XFER_DISABLE Date: Thu, 23 Sep 2021 17:37:19 +0200 Message-Id: <3566ec0a1e466fb72cb94b902278d7d71a3a08ac.1632411336.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632411538092100001 Content-Type: text/plain; charset="utf-8" QEMU added the capability to disable file transfers via spice in commit 5ad24e5f3b ("spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)") released in qemu-v1.6.0 and the option can't be disabled. Remove the unnecessary validation. Signed-off-by: Peter Krempa --- src/qemu/qemu_validate.c | 7 ------- tests/qemuhotplugtest.c | 1 - tests/qemuxml2argvtest.c | 6 ++---- tests/qemuxml2xmltest.c | 4 +--- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 865b42f81f..13fbfd01b2 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4031,13 +4031,6 @@ qemuValidateDomainDeviceDefSPICEGraphics(const virDo= mainGraphicsDef *graphics, break; } - if (graphics->data.spice.filetransfer =3D=3D VIR_TRISTATE_BOOL_NO && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU can't disable file transfers throu= gh spice")); - return -1; - } - if (graphics->data.spice.gl =3D=3D VIR_TRISTATE_BOOL_YES) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_GL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 57d76845c6..ec448da09e 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -91,7 +91,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_PIIX_DISABLE_S4); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VNC); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE); - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_BLOCK); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_KBD); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e126e828eb..13e387df3f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1503,8 +1503,7 @@ mymain(void) QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL); DO_TEST("graphics-spice", QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE_FILE_XFER_DISABLE); + QEMU_CAPS_DEVICE_QXL); DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceSASL =3D 1; @@ -1537,8 +1536,7 @@ mymain(void) QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-spice-agent-file-xfer", QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE_FILE_XFER_DISABLE); + QEMU_CAPS_DEVICE_QXL); DO_TEST("graphics-spice-socket", QEMU_CAPS_SPICE, QEMU_CAPS_SPICE_UNIX, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 59d1e24289..49b291fadb 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -389,8 +389,7 @@ mymain(void) cfg->spiceTLS =3D true; DO_TEST("graphics-spice", QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_FILE_XFER_DISABLE); + QEMU_CAPS_SPICE); DO_TEST("graphics-spice-compression", QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE); @@ -1225,7 +1224,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_FILE_XFER_DISABLE, QEMU_CAPS_SPICE_GL, QEMU_CAPS_SPICE_RENDERNODE); DO_TEST("video-virtio-gpu-sdl-gl", --=20 2.31.1