From nobody Sat May 18 23:55:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1635866983; cv=none; d=zohomail.com; s=zohoarc; b=Fhle50njqzmCNV1+NnBMB8iMLNC/+slItE+srdDFsj01aChLHS3NltKlv//+oAJHTTgwAfDaDMlNJNr9uzSxCsVexcQYxJGnvXNh+zKXrNNnYivgmG/VMRbl0IgndBy6bHjHO1GLg4u0bl60wGkvqtfB4IK2QHhxA3GOoi2qoI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635866983; 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=UhRUak9DzQ8Q8jR333U2OIIcyS+G6AYJEFRJDPlFiKA=; b=U3lAY25P8whLRcISsEg+HO3VM6vXJJCtAvdnOCUOtG4zLvFmg7WFoUkbXT49sb58afhSLRmU55obp6VW+i0LXyUfwTynIAJ7UdYwJkNW9DXrU0hpP7dO64/up1xsBaz2kuiqur2Ef2obwHGbNgvG6sCmXgZw3Tiqmg92hONRGmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1635866983523663.360162129844; Tue, 2 Nov 2021 08:29: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-121-g8ydRAqNPYqIKimoYfy3Aw-1; Tue, 02 Nov 2021 11:29:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3395819251A0; Tue, 2 Nov 2021 15:29:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A0B6A60BE5; Tue, 2 Nov 2021 15:29:32 +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 41A564EA2A; Tue, 2 Nov 2021 15:29:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSFor030282 for ; Tue, 2 Nov 2021 11:28:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2EDF919EF9; Tue, 2 Nov 2021 15:28:15 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87A861346F for ; Tue, 2 Nov 2021 15:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635866982; 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=UhRUak9DzQ8Q8jR333U2OIIcyS+G6AYJEFRJDPlFiKA=; b=PT0ka8zVfebhDowu0mRg6aEzYwHE0oDqUG6tVkDHNwCQzhlokS67UQqB2GhOEqaKVHss+b nDTHDzABeSA/EQppZf9rzKmUMVeam1wqP2vXH6mPE+qTV1ol1dqnHqlaemgtbYiXgOK0Gx qbLRQawpxOSujs32orudFOSKCbUd9MU= X-MC-Unique: g8ydRAqNPYqIKimoYfy3Aw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/7] tests: remove disks from spice tests Date: Tue, 2 Nov 2021 16:27:52 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.12 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: 1635866984783100001 Reduce the churn in following patches. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- .../graphics-spice-agent-file-xfer.args | 2 -- .../graphics-spice-agent-file-xfer.xml | 5 ----- .../qemuxml2argvdata/graphics-spice-agentmouse.args | 2 -- .../qemuxml2argvdata/graphics-spice-agentmouse.xml | 5 ----- .../graphics-spice-compression.args | 2 -- .../qemuxml2argvdata/graphics-spice-compression.xml | 5 ----- .../graphics-spice-egl-headless.args | 2 -- .../graphics-spice-egl-headless.xml | 5 ----- .../graphics-spice-invalid-egl-headless.xml | 5 ----- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 -- tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml | 5 ----- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 -- tests/qemuxml2argvdata/graphics-spice-sasl.xml | 6 ------ tests/qemuxml2argvdata/graphics-spice-timeout.args | 4 ---- tests/qemuxml2argvdata/graphics-spice-timeout.xml | 13 ------------- tests/qemuxml2argvdata/graphics-spice.args | 2 -- tests/qemuxml2argvdata/graphics-spice.xml | 5 ----- .../graphics-spice-compression.xml | 6 ------ .../graphics-spice-egl-headless.xml | 6 ------ tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 6 ------ tests/qemuxml2xmloutdata/graphics-spice-timeout.xml | 13 ------------- tests/qemuxml2xmloutdata/graphics-spice.xml | 6 ------ 22 files changed, 109 deletions(-) diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/t= ests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index a40ecdfb64..5a01f17ec4 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=3Dspice \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-fil= e-xfer=3Don,seamless-migration=3Don \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml b/te= sts/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml index 2ef19b1cf9..bf1ce6bca2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/= qemuxml2argvdata/graphics-spice-agentmouse.args index af80edd5c6..6e9aeb0878 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args @@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=3Dspice \ -boot strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ -device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,agent-mouse=3Doff,x509= -dir=3D/etc/pki/libvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml b/tests/q= emuxml2argvdata/graphics-spice-agentmouse.xml index f6a28d6d4c..45c65b50d0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml @@ -13,11 +13,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests= /qemuxml2argvdata/graphics-spice-compression.args index 4f939a7f08..fc5c8f97fb 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=3Dspice \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-g= lz-wan-compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilte= r,seamless-migration=3Don \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,bus=3Dpci= .0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.xml b/tests/= qemuxml2argvdata/graphics-spice-compression.xml index 2d2bae8bc2..bbd4bc3e16 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/graphics-spice-compression.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/test= s/qemuxml2argvdata/graphics-spice-egl-headless.args index 9410251dfc..f0fb493a41 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=3Dspice \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D5903,addr=3D127.0.0.1,seamless-migration=3Don \ -display egl-headless \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml b/tests= /qemuxml2argvdata/graphics-spice-egl-headless.xml index dd771dcf3a..ca30a19405 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml= b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml index 39f94c35bb..b3097d9974 100644 --- a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qem= uxml2argvdata/graphics-spice-qxl-vga.args index b3c5395835..13144632d9 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=3Dspice \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,seamless-migratio= n=3Don \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml b/tests/qemu= xml2argvdata/graphics-spice-qxl-vga.xml index 64c48fcbe1..98c58d68ef 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxm= l2argvdata/graphics-spice-sasl.args index b95381ae1e..42cbbbb568 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -26,8 +26,6 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,x509-dir=3D/= etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration=3Don \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.xml b/tests/qemuxml= 2argvdata/graphics-spice-sasl.xml index 6b15807402..335f6d2c64 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.xml +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - - -
- diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qem= uxml2argvdata/graphics-spice-timeout.args index 3bdba66427..b1c5bb5c70 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -26,10 +26,6 @@ QEMU_AUDIO_DRV=3Dspice \ -boot menu=3Don,strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -usb \ --drive file=3D/var/lib/libvirt/images/f14.img,format=3Dqcow2,if=3Dnone,id= =3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D2 \ --drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,id=3Ddrive-ide0-1-0,readonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ -netdev tap,fd=3D3,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:71:70:89,bus=3D= pci.0,addr=3D0x7 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemu= xml2argvdata/graphics-spice-timeout.xml index d96f519bf8..065318651f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml @@ -39,19 +39,6 @@ restart /usr/bin/qemu-system-i386 - - - - -
- - - - - - -
-
diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2arg= vdata/graphics-spice.args index dd715c8ef4..f2b638fbbd 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -25,8 +25,6 @@ QEMU_AUDIO_DRV=3Dspice \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Din= puts,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan-= compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disab= le-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3Don \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,bus=3Dpci= .0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.xml b/tests/qemuxml2argv= data/graphics-spice.xml index 657b6ccbed..4154b993ba 100644 --- a/tests/qemuxml2argvdata/graphics-spice.xml +++ b/tests/qemuxml2argvdata/graphics-spice.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - -
- diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/test= s/qemuxml2xmloutdata/graphics-spice-compression.xml index 8772cd3343..385128b76a 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - - -
-
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tes= ts/qemuxml2xmloutdata/graphics-spice-egl-headless.xml index eee55cbeeb..edf34439e9 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - - -
-
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qe= muxml2xmloutdata/graphics-spice-qxl-vga.xml index 35038d128f..acd6610566 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - - -
-
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qe= muxml2xmloutdata/graphics-spice-timeout.xml index 63eba26668..bd0249df28 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml @@ -39,19 +39,6 @@ restart /usr/bin/qemu-system-i386 - - - - -
- - - - - - -
-
diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xm= loutdata/graphics-spice.xml index 81115dc4b5..b4af4f0820 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i386 - - - - -
-
--=20 2.31.1 From nobody Sat May 18 23:55:16 2024 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=1635866997; cv=none; d=zohomail.com; s=zohoarc; b=LaoBdeTXLypCcBVkpatKc1d0s2N0Pop9sJFMRzS8goNiOihXi2ZBTkEOaC8riGGVj8as55r2kXDQLEIp2WrIDsr8UZK+GhsH0JAKBQacdpIm218K5C9ouNdov+cjBD9J1kPXXXs94tgfOI7EmKoqVY8YJFekgcrHg5YWHLsSQRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635866997; 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=d3gJF+s2PPResX2zLucDvabHw0kzqxggdO26cdwFEeg=; b=cV7DFBquTbu8kvuuELSP4TNfchSIYO9Ah3OvSQaVAZW7eDVXRA5Xni1gjWXkfnAwLaviMAIN10i1XQI3NyUiJlT0ERMcw0P3BfbkoFufqy22tj/tT9kYfPG0wfenn/7HhxhRKxamorEQ3vRN6icfJPdge1e4siim+r+0yNzsdys= 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 1635866997028212.6761758320216; Tue, 2 Nov 2021 08:29: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-116-Srm7y2HaPg6odJPllAvcWw-1; Tue, 02 Nov 2021 11:29:51 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A18156B27; Tue, 2 Nov 2021 15:29:47 +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 DAE4C60C05; Tue, 2 Nov 2021 15:29:46 +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 B110A1800FDD; Tue, 2 Nov 2021 15:29:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSFal030292 for ; Tue, 2 Nov 2021 11:28:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id F0A6B1346F; Tue, 2 Nov 2021 15:28:15 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B60F57CB9 for ; Tue, 2 Nov 2021 15:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635866996; 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=d3gJF+s2PPResX2zLucDvabHw0kzqxggdO26cdwFEeg=; b=LsesjZgmqysFQ8vMPGhgI8eZ2EYF8ZNYQhPvQsjwPEFrTT/gGjDWbRmFqh6WgZV3QRSzZP wf+71bc/rGG6VRj1P4tZDatFwVVeNZcmSqj2ezjf1kJsjXGGbIBThfB/tcMyxKe2QA0HcB tL45dssUw2sPwgYu/GyJ1EqwfutX9pQ= X-MC-Unique: Srm7y2HaPg6odJPllAvcWw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/7] tests: qemuxml2xmltest: move graphics-spice-timeout Date: Tue, 2 Nov 2021 16:27:53 +0100 Message-Id: <38c275092589f282cc736c7deabbd6f2989fe059.1635866835.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.12 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: 1635866998771100001 Move the test closer to other graphics-spice tests. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- tests/qemuxml2xmltest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a066c35db0..3abf58a9f4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -415,6 +415,9 @@ mymain(void) QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_EGL_HEADLESS); + DO_TEST("graphics-spice-timeout", + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_SPICE); =20 DO_TEST("graphics-egl-headless-rendernode", QEMU_CAPS_DEVICE_CIRRUS_VGA, @@ -766,9 +769,6 @@ mymain(void) DO_TEST("graphics-listen-network2", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_VNC); - DO_TEST("graphics-spice-timeout", - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_SPICE); DO_TEST_NOCAPS("numad-auto-vcpu-no-numatune"); DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement"); DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset"); --=20 2.31.1 From nobody Sat May 18 23:55:16 2024 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=1635867026; cv=none; d=zohomail.com; s=zohoarc; b=Y/yTzY1+bjAu/kxtIUBCwRlMQoEgwYjNAmBqXyCnTzP4wkRO21t+0w3WDnBpkF15NYaZ0R5qt2QPA0YYGiZg51kUnkduo7e4JS1SjcsVQgD7p6BqHe80D3UDUVVW+7dCoZIqNBfcxzjI00G0ig1tC4m/jgJgocx4bU2FIx1+A7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635867026; 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=Uo04tCT/yEfmadQ69tgYgRby+b9ctzDWUkNuqFXKdDI=; b=c03T1Ae59EIOgIONjow46cHvoOKZEB6kEKnlkG0O3Hh8+2vk2nHNopMjqFkXRXzIXR11GMYrGEvhHRCE0INNO5sWdMVLppv64GxzLWyFyJH/2quvIfB7XbBK83HdaX3N4IFiIGkYtDrW9l+vHj4+AbKKBhSJNbmvm74HTU5T5XQ= 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 1635867026388445.18631938133285; Tue, 2 Nov 2021 08:30:26 -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-263-TbVlymP1PEWhA_1VLM1KFw-1; Tue, 02 Nov 2021 11:30:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3292415875A0; Tue, 2 Nov 2021 15:30:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DF7260C82; Tue, 2 Nov 2021 15:30:17 +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 C7BFC4EA3D; Tue, 2 Nov 2021 15:30:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSGwD030301 for ; Tue, 2 Nov 2021 11:28:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE3DE19EF9; Tue, 2 Nov 2021 15:28:16 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 498191346F for ; Tue, 2 Nov 2021 15:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635867025; 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=Uo04tCT/yEfmadQ69tgYgRby+b9ctzDWUkNuqFXKdDI=; b=McrmnDRDoKlr08ZKW7koEmD2Ef6IbnLBxw28wT+SrYOp5zlRhdfLYBPCHZrNLDyoSc74Or 8bvQyvzySgB6AUEe7Q+paWv/ijgU5eRB8fyPtkFpOrUg+sDE5DHt9hVKOrSGIQ/x2u7eb2 LiJVVRhNySi0ux5e1jv2XnYnQEq3PBY= X-MC-Unique: TbVlymP1PEWhA_1VLM1KFw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] tests: qemuxml2xml: use latest caps for spice tests Date: Tue, 2 Nov 2021 16:27:54 +0100 Message-Id: <1948be37b9941a140b4b0b86d780e78143ead45a.1635866835.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.12 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: 1635867027003100007 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- ...s-spice-auto-socket-cfg.x86_64-latest.xml} | 5 ++- ...phics-spice-auto-socket.x86_64-latest.xml} | 5 ++- ...phics-spice-compression.x86_64-latest.xml} | 5 ++- ...hics-spice-egl-headless.x86_64-latest.xml} | 5 ++- ... graphics-spice-qxl-vga.x86_64-latest.xml} | 5 ++- ...> graphics-spice-socket.x86_64-latest.xml} | 5 ++- ... graphics-spice-timeout.x86_64-latest.xml} | 2 +- ...e.xml =3D> graphics-spice.x86_64-latest.xml} | 5 ++- tests/qemuxml2xmltest.c | 35 +++++-------------- 9 files changed, 37 insertions(+), 35 deletions(-) rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket-cfg.xml =3D> g= raphics-spice-auto-socket-cfg.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket.xml =3D> graph= ics-spice-auto-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-compression.xml =3D> graph= ics-spice-compression.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{graphics-spice-egl-headless.xml =3D> grap= hics-spice-egl-headless.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{graphics-spice-qxl-vga.xml =3D> graphics-= spice-qxl-vga.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{graphics-spice-socket.xml =3D> graphics-s= pice-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-timeout.xml =3D> graphics-= spice-timeout.x86_64-latest.xml} (98%) rename tests/qemuxml2xmloutdata/{graphics-spice.xml =3D> graphics-spice.x8= 6_64-latest.xml} (92%) diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml b/= tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-la= test.xml index f55c4b28a0..c6e2db610e 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest= .xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml b/test= s/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest= .xml index a2d6688ffe..50386c74ce 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/test= s/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/graphics-spice-compression.xml rename to tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest= .xml index 385128b76a..9903efc4ed 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tes= ts/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml rename to tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-lates= t.xml index edf34439e9..c9bab0de11 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qe= muxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml rename to tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml index acd6610566..cb687cf788 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml b/tests/qem= uxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/graphics-spice-socket.xml rename to tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml index dc429d3953..0e34ab8551 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qe= muxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml similarity index 98% rename from tests/qemuxml2xmloutdata/graphics-spice-timeout.xml rename to tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml index bd0249df28..fd34a6caf5 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml @@ -45,7 +45,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xm= loutdata/graphics-spice.x86_64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/graphics-spice.xml rename to tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml index b4af4f0820..31ce5c8d7d 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml @@ -8,13 +8,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-i386 - +
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3abf58a9f4..7ea066fcda 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -388,36 +388,17 @@ mymain(void) DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_C= APS_SDL); =20 cfg->spiceTLS =3D true; - DO_TEST("graphics-spice", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE); - DO_TEST("graphics-spice-compression", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE); - DO_TEST("graphics-spice-qxl-vga", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE); - DO_TEST("graphics-spice-socket", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX); - DO_TEST("graphics-spice-auto-socket", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX); + DO_TEST_CAPS_LATEST("graphics-spice"); + DO_TEST_CAPS_LATEST("graphics-spice-compression"); + DO_TEST_CAPS_LATEST("graphics-spice-qxl-vga"); + DO_TEST_CAPS_LATEST("graphics-spice-socket"); + DO_TEST_CAPS_LATEST("graphics-spice-auto-socket"); cfg->spiceAutoUnixSocket =3D true; - DO_TEST("graphics-spice-auto-socket-cfg", - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_SPICE); + DO_TEST_CAPS_LATEST("graphics-spice-auto-socket-cfg"); cfg->spiceAutoUnixSocket =3D false; cfg->spiceTLS =3D false; - DO_TEST("graphics-spice-egl-headless", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE, - QEMU_CAPS_EGL_HEADLESS); - DO_TEST("graphics-spice-timeout", - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_SPICE); + DO_TEST_CAPS_LATEST("graphics-spice-egl-headless"); + DO_TEST_CAPS_LATEST("graphics-spice-timeout"); =20 DO_TEST("graphics-egl-headless-rendernode", QEMU_CAPS_DEVICE_CIRRUS_VGA, --=20 2.31.1 From nobody Sat May 18 23:55:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1635867006; cv=none; d=zohomail.com; s=zohoarc; b=HyfQmY+SPt6+YWHSRMbVsppr4966m9cJ75kBTxswFIg2E0tg8NeTEk2TXNoTBz01DT+YMNHIUDIbcrKiktwoATc7/fmnyftWJDv0E3W0eZrpm5kZ/z/afBsDxRPhyyZDm/tCT6Q6LqymeE47/oovgTWZut0CO4iykne421g0Bqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635867006; 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=Tnz1eC7p8S0LAH+21DJVH0xKfifUNtkKKPMiCmsJ7es=; b=DDaW0xoqmEruDz+xpaw+gMOeinc9PIjCEEfejZa12U5ExgP/mtNCNVFzsdLA8cOepG22kawzqhhDQv3Gd6K0hIODkQW9as06kZ5TYaxU2kwumMmzPMZKWu/eFF2YIBvHFu+C2lBZMrrjJ5uhyzONstz1quqIJZNxiYHusi7+7Dg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1635867006896848.29044098095; Tue, 2 Nov 2021 08:30:06 -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-175-1LxDQdhLNECudrxfDGkqTw-1; Tue, 02 Nov 2021 11:29:55 -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 422981585C2A; Tue, 2 Nov 2021 15:29:50 +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 28854104A9C1; Tue, 2 Nov 2021 15:29:50 +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 F3A201819AC2; Tue, 2 Nov 2021 15:29:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSH8Z030311 for ; Tue, 2 Nov 2021 11:28:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id B666567843; Tue, 2 Nov 2021 15:28:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A5DC1346F for ; Tue, 2 Nov 2021 15:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635867005; 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=Tnz1eC7p8S0LAH+21DJVH0xKfifUNtkKKPMiCmsJ7es=; b=FIrybhAMvAiqnBQBjAHdcTXKJkd01x4r+QTYE4k6mgSVFw/ccjQmrhhrNKM7pUlvwrJNmE CZ8ibOmhwpm/u/TGcQdU6fBat2WMYAtu9FXpro2wXujNYtX0B9GFpFFFmv5j9e8nq3d3RJ xzhzQ+JEW5ell/2vDsJQcuEAm2TPgnY= X-MC-Unique: 1LxDQdhLNECudrxfDGkqTw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] tests: qemuxml2argv: use latest caps for spice tests Date: Tue, 2 Nov 2021 16:27:55 +0100 Message-Id: <3d32b23a8e04e893511004ddd7658c1b8926bdfb.1635866835.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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: 1635867008581100005 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- .../graphics-spice-agent-file-xfer.args | 32 ---------- ...s-spice-agent-file-xfer.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-agentmouse.args | 34 ----------- ...aphics-spice-agentmouse.x86_64-latest.args | 37 +++++++++++ ...-spice-auto-socket-cfg.x86_64-latest.args} | 17 +++--- ...hics-spice-auto-socket.x86_64-latest.args} | 17 +++--- .../graphics-spice-compression.args | 32 ---------- ...phics-spice-compression.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-egl-headless.args | 32 ---------- ...hics-spice-egl-headless.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-no-args.args | 31 ---------- .../graphics-spice-no-args.x86_64-latest.args | 34 +++++++++++ .../graphics-spice-qxl-vga.args | 32 ---------- .../graphics-spice-qxl-vga.x86_64-latest.args | 35 +++++++++++ .../qemuxml2argvdata/graphics-spice-sasl.args | 32 ---------- .../graphics-spice-sasl.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-socket.args | 30 --------- .../graphics-spice-socket.x86_64-latest.args | 33 ++++++++++ .../graphics-spice-timeout.args | 36 ----------- .../graphics-spice-timeout.x86_64-latest.args | 38 ++++++++++++ .../graphics-spice-usb-redir.args | 38 ------------ ...raphics-spice-usb-redir.x86_64-latest.args | 41 +++++++++++++ tests/qemuxml2argvdata/graphics-spice.args | 32 ---------- .../graphics-spice.x86_64-latest.args | 35 +++++++++++ tests/qemuxml2argvtest.c | 61 ++++--------------- 25 files changed, 426 insertions(+), 423 deletions(-) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.a= rgs create mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x= 86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64= -latest.args rename tests/qemuxml2argvdata/{graphics-spice-auto-socket-cfg.args =3D> gr= aphics-spice-auto-socket-cfg.x86_64-latest.args} (50%) rename tests/qemuxml2argvdata/{graphics-spice-auto-socket.args =3D> graphi= cs-spice-auto-socket.x86_64-latest.args} (50%) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.x86_6= 4-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_= 64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-la= test.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-la= test.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-lates= t.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.x86_64-lat= est.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-la= test.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-= latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice.args create mode 100644 tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/t= ests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args deleted file mode 100644 index 5a01f17ec4..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-fil= e-xfer=3Don,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args new file mode 100644 index 0000000000..3bcfd55dae --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-fil= e-xfer=3Don,seamless-migration=3Don \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","addr= ":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/= qemuxml2argvdata/graphics-spice-agentmouse.args deleted file mode 100644 index 6e9aeb0878..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ --usb \ --chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ --device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,agent-mouse=3Doff,x509= -dir=3D/etc/pki/libvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args new file mode 100644 index 0000000000..44d401da5b --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,agent-mouse=3Doff,x509= -dir=3D/etc/pki/libvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/t= ests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args similarity index 50% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args rename to tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-late= st.args index 51d8ce8aa3..8cb5ffa4c3 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs @@ -6,25 +6,28 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ -m 214 \ --realtime mlock=3Doff \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ -spice unix,addr=3D/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migra= tion=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests= /qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args similarity index 50% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket.args rename to tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.a= rgs index 51d8ce8aa3..8cb5ffa4c3 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -6,25 +6,28 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ -m 214 \ --realtime mlock=3Doff \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ -spice unix,addr=3D/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migra= tion=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests= /qemuxml2argvdata/graphics-spice-compression.args deleted file mode 100644 index fc5c8f97fb..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-g= lz-wan-compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilte= r,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,bus=3Dpci= .0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.ar= gs new file mode 100644 index 0000000000..a73d882164 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-g= lz-wan-compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilte= r,seamless-migration=3Don \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/test= s/qemuxml2argvdata/graphics-spice-egl-headless.args deleted file mode 100644 index f0fb493a41..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D5903,addr=3D127.0.0.1,seamless-migration=3Don \ --display egl-headless \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.= args new file mode 100644 index 0000000000..74f39e9e10 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,addr=3D127.0.0.1,seamless-migration=3Don \ +-display egl-headless,rendernode=3D/dev/dri/foo \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qem= uxml2argvdata/graphics-spice-no-args.args deleted file mode 100644 index 32da9284f8..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args new file mode 100644 index 0000000000..19e18162fc --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D0,seamless-migration=3Don \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qem= uxml2argvdata/graphics-spice-qxl-vga.args deleted file mode 100644 index 13144632d9..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,seamless-migratio= n=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args new file mode 100644 index 0000000000..8503eb36cb --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,seamless-migratio= n=3Don \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxm= l2argvdata/graphics-spice-sasl.args deleted file mode 100644 index 42cbbbb568..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -SASL_CONF_PATH=3D/root/.sasl2 \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,x509-dir=3D/= etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args new file mode 100644 index 0000000000..78dc8d3c8d --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +SASL_CONF_PATH=3D/root/.sasl2 \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,x509-dir=3D/= etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration=3Don \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemu= xml2argvdata/graphics-spice-socket.args deleted file mode 100644 index 4e09935a69..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-socket.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice unix,addr=3D/tmp/spice.sock,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args new file mode 100644 index 0000000000..4f04e1e86f --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice unix,addr=3D/tmp/spice.sock,seamless-migration=3Don \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qem= uxml2argvdata/graphics-spice-timeout.args deleted file mode 100644 index b1c5bb5c70..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-f14 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-f14/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-f14/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-f14/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3Df14,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-f14/= master-key.aes \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ --m 1024 \ --realtime mlock=3Doff \ --smp 2,sockets=3D1,cores=3D2,threads=3D1 \ --uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-f14/monitor.soc= k,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot menu=3Don,strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ --usb \ --netdev tap,fd=3D3,id=3Dhostnet0 \ --device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:71:70:89,bus=3D= pci.0,addr=3D0x7 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ --spice port=3D5900,addr=3D127.0.0.1,seamless-migration=3Don \ --device VGA,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device AC97,id=3Dsound0,bus=3Dpci.0,addr=3D0x3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args new file mode 100644 index 0000000000..3a97fefc99 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-f14 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-f14/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-f14/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-f14/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3Df14,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-f14/master-key.aes"}' \ +-machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D1,dies=3D1,cores=3D2,threads=3D1 \ +-uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot menu=3Don,strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-netdev tap,fd=3D3,id=3Dhostnet0 \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5900,addr=3D127.0.0.1,seamless-migration=3Don \ +-device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x2"}' \ +-device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/q= emuxml2argvdata/graphics-spice-usb-redir.args deleted file mode 100644 index 06fa89b8f0..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,tls-channel=3Dusb= redir,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan= -compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disa= ble-copy-paste=3Don,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ --chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args new file mode 100644 index 0000000000..32e555a129 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args @@ -0,0 +1,41 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,tls-channel=3Dusb= redir,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan= -compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disa= ble-copy-paste=3Don,seamless-migration=3Don \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"1"}' \ +-chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2arg= vdata/graphics-spice.args deleted file mode 100644 index f2b638fbbd..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dspice \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Din= puts,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan-= compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disab= le-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,bus=3Dpci= .0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tes= ts/qemuxml2argvdata/graphics-spice.x86_64-latest.args new file mode 100644 index 0000000000..58355bd0af --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev id=3Daudio1,driver=3Dspice \ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Din= puts,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan-= compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disab= le-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3Don \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-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 7414aafd11..dad5028380 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1498,60 +1498,25 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-sdl-egl-headless"); DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL); - DO_TEST("graphics-spice", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-no-args", - QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-spice"); + DO_TEST_CAPS_LATEST("graphics-spice-no-args"); driver.config->spiceSASL =3D 1; driver.config->spiceSASLdir =3D g_strdup("/root/.sasl2"); - DO_TEST("graphics-spice-sasl", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_CAPS_LATEST("graphics-spice-sasl"); VIR_FREE(driver.config->spiceSASLdir); driver.config->spiceSASL =3D 0; - DO_TEST("graphics-spice-agentmouse", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-spice-compression", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-timeout", - QEMU_CAPS_KVM, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_DEVICE_VGA); - DO_TEST("graphics-spice-qxl-vga", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-usb-redir", - QEMU_CAPS_SPICE, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-spice-agent-file-xfer", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-socket", - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-spice-auto-socket", - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-spice-agentmouse"); + DO_TEST_CAPS_LATEST("graphics-spice-compression"); + DO_TEST_CAPS_LATEST("graphics-spice-timeout"); + DO_TEST_CAPS_LATEST("graphics-spice-qxl-vga"); + DO_TEST_CAPS_LATEST("graphics-spice-usb-redir"); + DO_TEST_CAPS_LATEST("graphics-spice-agent-file-xfer"); + DO_TEST_CAPS_LATEST("graphics-spice-socket"); + DO_TEST_CAPS_LATEST("graphics-spice-auto-socket"); driver.config->spiceAutoUnixSocket =3D true; - DO_TEST("graphics-spice-auto-socket-cfg", - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-spice-auto-socket-cfg"); driver.config->spiceAutoUnixSocket =3D false; - DO_TEST("graphics-spice-egl-headless", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_EGL_HEADLESS); + DO_TEST_CAPS_LATEST("graphics-spice-egl-headless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-spice-invalid-egl-headless"); DO_TEST_CAPS_LATEST("graphics-spice-gl-auto-rendernode"); =20 --=20 2.31.1 From nobody Sat May 18 23:55:16 2024 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=1635867386; cv=none; d=zohomail.com; s=zohoarc; b=TwLoCzMw2fXp1a+0ccgqFMwsJTavtvylDDvutz45ZSWQ79u/lpk5W/ku7A1qK1/36uX5W3nrgKaZTy+A4baMtZZiX6fFlwWi3d15/idtpUKrTRnwwKUuNHXOvSV7xRlEhT0N0p0QFqz3cxAo8Ac1Y6mitjIVmTyG/MeLU3OpEDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635867386; 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=Z1f8K4/B+DzG/22b2412trGgUHiQT5tdhPZGD9v7LQk=; b=Mq1TuxSBzlQ0REn0OZVKL3vqzN3ZFTN9DQC8MaGavaaa2/H7PsuFaEPncOFlM5QaQ1b2yH/jyl9ByE911v3DC2xkzGx9aOpkuK4b9vARDmNy6RkNp5JU+NjBXdCGcCxYoqH5gsIH0SC0j5QEfwJiwf6cRZ5braCs0HQaNC5Ygx8= 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 1635867386186633.5768688397914; Tue, 2 Nov 2021 08:36:26 -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-500-KwJ0tszbOq-70QG2umJY4w-1; Tue, 02 Nov 2021 11:36:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CD2B112A6A6; Tue, 2 Nov 2021 15:36:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5566460BE5; Tue, 2 Nov 2021 15:36:17 +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 784434EA2A; Tue, 2 Nov 2021 15:36:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSLZm030332 for ; Tue, 2 Nov 2021 11:28:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25C171346F; Tue, 2 Nov 2021 15:28:21 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id A51B167843 for ; Tue, 2 Nov 2021 15:28:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635867385; 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=Z1f8K4/B+DzG/22b2412trGgUHiQT5tdhPZGD9v7LQk=; b=jOx68n97LatEpsjwT9WXl4zir2F/hsCH1nltNn7pZkB0/k+XboLv7hw41TLhaAJ6rtyzk3 Kv3o3qgJbQ7F1EUET19Zx7HBEvyUMlhvrnh2qOIkEq42cYhAKUe+luaWsuteGIRX8EF9DW ZpCzuYtSaDeUltmhUfK3xZhnYAbXZRA= X-MC-Unique: KwJ0tszbOq-70QG2umJY4w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/7] tests: convert name-escape to use real caps Date: Tue, 2 Nov 2021 16:27:56 +0100 Message-Id: <68dd22417d833e4058bc064e9ab0b0a7b42f844d.1635866835.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.12 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: 1635867388368100001 For later QEMUs than 2.11 we do FD passing for character devices. Use both the latest capabilities and 2.11 capabilities, to catch escaping of the chardev paths as well. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- ...pe.args =3D> name-escape.x86_64-2.11.0.args} | 7 +-- .../name-escape.x86_64-latest.args | 50 +++++++++++++++++++ tests/qemuxml2argvtest.c | 15 +----- 3 files changed, 56 insertions(+), 16 deletions(-) rename tests/qemuxml2argvdata/{name-escape.args =3D> name-escape.x86_64-2.= 11.0.args} (90%) create mode 100644 tests/qemuxml2argvdata/name-escape.x86_64-latest.args 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/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/= qemuxml2argvdata/name-escape.x86_64-latest.args new file mode 100644 index 0000000000..ceea515b17 --- /dev/null +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -0,0 +1,50 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3Dfoo=3D1,,bar=3D2,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-foo=3D1,bar=3D2/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"= smartcard0","bus":"ccid0.0"}' \ +-chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-add-fd set=3D0,fd=3D5 \ +-chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ +-device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ +-netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ +-audiodev id=3Daudio1,driver=3Dspice \ +-vnc vnc=3Dunix:/tmp/lib/domain--1-foo=3D1,,bar=3D2/vnc.sock,audiodev=3Dau= dio1 \ +-spice unix,addr=3D/tmp/lib/domain--1-foo=3D1,,bar=3D2/spice.sock,gl=3Don,= rendernode=3D/dev/dri/foo,,bar,seamless-migration=3Don \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-blockdev '{"driver":"iscsi","portal":"example.foo.org:3260","target":"iqn= .1992-01.com.example:my,storage","lun":1,"transport":"tcp","node-name":"lib= virt-2-backend","read-only":false}' \ +-device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":4}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-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 dad5028380..804f01fb01 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3180,19 +3180,8 @@ 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"); + DO_TEST_CAPS_LATEST("name-escape"); =20 DO_TEST_NOCAPS("master-key"); DO_TEST("usb-long-port-path", --=20 2.31.1 From nobody Sat May 18 23:55:16 2024 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=1635867006; cv=none; d=zohomail.com; s=zohoarc; b=O0v+egt57Lll5ScwB51vbzz5J9M28gY5MlBMBmTdsgp6DQgPDijXUfWQiwtOGKIHX+xPgWEPrxH6Kw8UnNCm0xIXqBlJqmNd/pqUCifa+/dDrJJ9mM0mscu+kQKh/PceGBcsEzekMjRuSZpdK6/Ujklry1ww6WXCBIB0n7sJL0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635867006; 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=ayov1WGctmXksa/z/k5vCvqiNsA0K6U1izVRn16V6Ik=; b=UT9Qj9k8YStCxX1aU7Xm72vLcqJUx2sr+pzMMxFGaYtviKX3Cwz4Ax4y9cZTeH7Fhk/YFkjBkF3abokg+3l3+zvSyPVrgDuxRJeDLoREdCzLP4izQZjMb3PKRMwNZgWxxLIXSXt1gaZXKi7rpldFxiAeVNaVnbYUxB+g6jsTwq0= 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 163586700618197.1043672046377; Tue, 2 Nov 2021 08:30:06 -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-98-RjFXo7sVMy69lTeudt-IoA-1; Tue, 02 Nov 2021 11:30:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79BC357232; Tue, 2 Nov 2021 15:29:54 +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 4F31E9D2C0; Tue, 2 Nov 2021 15:29:54 +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 1C4D9181A1D0; Tue, 2 Nov 2021 15:29:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSMnT030337 for ; Tue, 2 Nov 2021 11:28:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id E775419811; Tue, 2 Nov 2021 15:28:21 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71ED41346F for ; Tue, 2 Nov 2021 15:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635867005; 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=ayov1WGctmXksa/z/k5vCvqiNsA0K6U1izVRn16V6Ik=; b=fIPQEHwoWR3e8ZwNl3DxqFAOOsE6XgCZLwvnFu+KinWe1/Sibc8fAwRwkOm5mdxyQM9lt0 +OyFCHjpYzilC+yvoF5noD/fn3ytlVYChPcG+aG/nfCV+uCOoY9ssRuFyPfWSyyUp1XHpJ E+T4UtHcjje2gJ1Rj/2N2jsfJmN5Q60= X-MC-Unique: RjFXo7sVMy69lTeudt-IoA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/7] qemu: always assume QEMU_CAPS_SPICE_UNIX Date: Tue, 2 Nov 2021 16:27:57 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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: 1635867008286100001 The presence of this capability depends on QEMU being compiled with spice that has the SPICE_ADDR_FLAG_UNIX_ONLY constant. It was added by spice commit 5365caeaae released in spice v0.12.6, which is older than the spice version on our supported architectures. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- src/qemu/qemu_validate.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c4384dbe8b..397eea5ede 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4037,15 +4037,6 @@ qemuValidateDomainDeviceDefSPICEGraphics(const virDo= mainGraphicsDef *graphics, } =20 switch (glisten->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_UNIX)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unix socket for spice graphics are not suppo= rted " - "with this QEMU")); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: if (tlsPort > 0 && !cfg->spiceTLS) { @@ -4056,6 +4047,7 @@ qemuValidateDomainDeviceDefSPICEGraphics(const virDom= ainGraphicsDef *graphics, } break; =20 + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: --=20 2.31.1 From nobody Sat May 18 23:55:16 2024 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=1635867006; cv=none; d=zohomail.com; s=zohoarc; b=i3xH9HmBWjKtAKrEk1O5bVMQWavZi3wxvSCrlAEx8hN/ekocxWWKkaFywgiY9jMREpe5DlE7D6Eue8Bqciog5/ayReW4uj7Imi8UohaRX329x91X+6SWWR3mrSG20UDZCy2/YT1cdVY9oyiqaSgPaToHTw4KSdWHqi2MwzWxOmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635867006; 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=L72se2jKG5XUpPjw/1FVndEzhCVAxAO3ThfcOw5Bm9s=; b=aGzL78wG28PG5rZs4amUUafrq7JfHG0p540bDEFq7bMNaOf7nxRY8tJZMPhxb2jTrKRD6bS33G+1ER/02Fw2kMNZecPrDcTzR0O6i9cr0e5tjiPhgjDT1w3b7xtQUFGW4KAMwT/LZLb4+7h2JzOLu4rI0juYDbaB2MrbfDEt4s0= 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 1635867006517327.5136630937625; Tue, 2 Nov 2021 08:30:06 -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-424-sE1hv1PdMYqTBvcGL8JbbA-1; Tue, 02 Nov 2021 11:30:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4520D879519; Tue, 2 Nov 2021 15:29:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4D38772FE; Tue, 2 Nov 2021 15:29:56 +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 AA2BC4EA2F; Tue, 2 Nov 2021 15:29:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2FSMqx030342 for ; Tue, 2 Nov 2021 11:28:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id B4D7A19811; Tue, 2 Nov 2021 15:28:22 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F9DC1346F for ; Tue, 2 Nov 2021 15:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635867005; 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=L72se2jKG5XUpPjw/1FVndEzhCVAxAO3ThfcOw5Bm9s=; b=eOOrL2324EoMpRb7J68qwUYvBAY++vYkYC1S83/dB5MbH4WpjjA/ErdYfLAZgFrIe2vLsc /oHh7ukV6Neo9/KUSYeskaJLrkGPLWpuZcQKrcsp13tfTUvYCBkWAVpv569sFx0BkWgL+k iECP3j+/6u4a1YL5q+geV16ChkpPfjw= X-MC-Unique: sE1hv1PdMYqTBvcGL8JbbA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 7/7] qemu: retire QEMU_CAPS_SPICE_UNIX Date: Tue, 2 Nov 2021 16:27:58 +0100 Message-Id: <453bcdcae21440196f99c11937ac198bc1f03958.1635866835.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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: 1635867008292100002 It is now unused. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Tim Wiederhake --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - 21 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47b488213f..e4fdd9a1eb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -382,7 +382,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS */ =20 /* 225 */ - "spice-unix", /* QEMU_CAPS_SPICE_UNIX */ + "spice-unix", /* X_QEMU_CAPS_SPICE_UNIX */ "drive-detect-zeroes", /* QEMU_CAPS_DRIVE_DETECT_ZEROES */ "tls-creds-x509", /* X_QEMU_CAPS_OBJECT_TLS_CREDS_X509 */ "display", /* X_QEMU_CAPS_DISPLAY */ @@ -3196,7 +3196,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCaps= CommandLine[] =3D { { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, { "spice", "gl", QEMU_CAPS_SPICE_GL }, - { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, { "vnc", "audiodev", QEMU_CAPS_AUDIODEV }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2bca284e10..61bdbdb2ac 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -362,7 +362,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs=3D */ =20 /* 225 */ - QEMU_CAPS_SPICE_UNIX, /* -spice unix */ + X_QEMU_CAPS_SPICE_UNIX, /* -spice unix */ QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes=3D */ X_QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */ X_QEMU_CAPS_DISPLAY, /* -display */ diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index 559bf16766..ed9826504c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -107,7 +107,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 745110142f..7f536db863 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index 5acce281b1..24ebdf3bbf 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index 92b3b10147..eedf55d677 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index 98f1dc041c..9ae7a9260a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index 88d0219e36..cbfdf4968e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 28643ca67d..2e5947aff6 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 7a38f44dea..40ad314d29 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index d3dde76939..415d12054b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index d8f9af8af2..58c7eb6651 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 3e99e52962..69f49020e7 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index dcec7cfb16..58af90b29f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -31,7 +31,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 18b7897bfa..578e16e8b0 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 29ea8b1b8c..a11d15f91a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 923aa240ad..bcc262551a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 78ede15fb3..1b394198f1 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index cbdbed7f86..1f4f49eb34 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index bb3a24b00f..9662214cd8 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -91,7 +91,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 519da73849..39179916c5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -104,7 +104,6 @@ - --=20 2.31.1