From nobody Sun Feb 8 09:22:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1635936943; cv=none; d=zohomail.com; s=zohoarc; b=aJ/gSREnwnadQasBltnL9fPM7sfQs37icBPEVhY9cfwZ4D1UBTsNgmUGirUhvm+/ENxoh5UsdgTQP3QqRzB2XrYa/dnA4vKtG5spOcTT7IMRSIbhlfCuKi2GDiyy0qVhDnGVBdz82PKOsqR4p0KL0/DM8IZ3saFwuGRSN+xm9ZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635936943; 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=WpaLBIOzOr2JnxmV32dRllDwb0Q5REfzNeNOagK13Qo=; b=VaGlckiO+NDV8nEgHm3Ls5yQgyaK8L2qrwVWDbqKLLlOziulZpwS9HPdqrPP5ROYXLaUueM2+pb9+VyZ+Ac/vrFXBkZM/PhEZX36VPp6+dsgdx6EquHzARthmkDuq0KSYD6d46Z/p+41oR2cjuHI6rCOYcFQbfaQZUehNaqfukU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635936943378768.0100155407129; Wed, 3 Nov 2021 03:55:43 -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-539-INwvNEvSMUarWnk1Hoy7dg-1; Wed, 03 Nov 2021 06:55:40 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84216100CCCE; Wed, 3 Nov 2021 10:55:35 +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 686101017CF3; Wed, 3 Nov 2021 10:55:35 +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 128971806D04; Wed, 3 Nov 2021 10:55:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A3AsX1R006163 for ; Wed, 3 Nov 2021 06:54:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id CC44429676; Wed, 3 Nov 2021 10:54:33 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55F261903D for ; Wed, 3 Nov 2021 10:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635936941; 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=WpaLBIOzOr2JnxmV32dRllDwb0Q5REfzNeNOagK13Qo=; b=Z7UZmA73SkuqDQQlUzfPAfuozksZYeRS6UoZgFkZ9DM+4Sppthfgz/sITcUQISp9BD7d7U zr39J4BKU9a+d4kA6Zd4t1c6s/8SLMTb6p0XjYm3Ihbv/m85IbYxcEvS9EZhxhWlp0S50A 56P3jB21pzx8rsh3dqBJeM15J29eJbM= X-MC-Unique: INwvNEvSMUarWnk1Hoy7dg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 5/7] tests: convert name-escape to use real caps Date: Wed, 3 Nov 2021 11:53:29 +0100 Message-Id: <325ef44461d1f4292d50b372ddf347a9e807759b.1635936638.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635936943743100001 For later QEMUs than 2.11 we do FD passing for character devices, so lock the capabilites to this exact version. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- ...-escape.args =3D> name-escape.x86_64-2.11.0.args} | 7 ++++--- tests/qemuxml2argvtest.c | 14 +------------- 2 files changed, 5 insertions(+), 16 deletions(-) rename tests/qemuxml2argvdata/{name-escape.args =3D> name-escape.x86_64-2.= 11.0.args} (90%) diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvda= ta/name-escape.x86_64-2.11.0.args similarity index 90% rename from tests/qemuxml2argvdata/name-escape.args rename to tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args index eb8d9ac10a..71770dc546 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dspice \ -name guest=3Dfoo=3D1,,bar=3D2,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-foo= =3D1,,bar=3D2/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-2.11,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -24,11 +24,11 @@ QEMU_AUDIO_DRV=3Dspice \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ -device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,cache=3Dnone,throttling.bps-total=3D5000,throttling.iops-total=3D60= 00,throttling.bps-total-max=3D10000,throttling.iops-total-max=3D11000,throt= tling.group=3Dlibvirt_iotune_group1,,foo \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,write-cache=3Don \ -device ccid-card-emulated,backend=3Dcertificates,cert1=3Dcert1,,foo,cert2= =3Dcert2,cert3=3Dcert3,db=3D/etc/pki/nssdb,,foo,id=3Dsmartcard0,bus=3Dccid0= .0 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ @@ -42,4 +42,5 @@ QEMU_AUDIO_DRV=3Dspice \ -drive file.driver=3Discsi,file.portal=3Dexample.foo.org:3260,file.target= =3Diqn.1992-01.com.example:my,,storage,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ -device scsi-generic,drive=3Ddrive-hostdev0,id=3Dhostdev0,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D0,lun=3D4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a171a978bd..a0498a0d92 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3178,19 +3178,7 @@ mymain(void) ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE, ARG_END); =20 - DO_TEST("name-escape", - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_SPICE_GL, - QEMU_CAPS_SPICE_RENDERNODE, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_CHARDEV_FILE_APPEND, - QEMU_CAPS_CCID_EMULATED, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_VER("name-escape", "2.11.0"); =20 DO_TEST_NOCAPS("master-key"); DO_TEST("usb-long-port-path", --=20 2.31.1