From nobody Fri Oct 18 08:39:22 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=1683650231; cv=none; d=zohomail.com; s=zohoarc; b=ElRyrBtvPWPV8SY8dXh5AC31FE1tAbp6UlWPqABH8+Xu+0gnWLDe7yl1p/VJRDxErCOaFrjAu4mwodk2v4f5RJzLOsWZDHLSvnbJPNNq6mqq4k6KeuWy/BQao2j7/FPqTk1cA4PPc8God3n8Aaej6+I4f63Y3a43yIA6M66UKNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683650231; 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=TAacvIseOx1WptkrcvCMTiY0H+6aChKgRGpH+40GlEc=; b=bMZ+7IcTFQPvA0MIlOGOVti6fRZTVDfn4pNmus/VgS3Irl/uEdf9x2mLRe5bE8MGDlJ0Rany8Kiv58kz/Udn907jd5Sh6JpkzPQ0nnZqkCv8O5aZyFvSGpSe4ilM+XSMxIeTriescgOotv36bGnL7ZUA1Kg+X4P6QKoDOPd9nAk= 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 1683650231578586.9142431443463; Tue, 9 May 2023 09:37:11 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-252-7Zm0qrwRPGaalEnVHylHIQ-1; Tue, 09 May 2023 12:35:40 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68DED885622; Tue, 9 May 2023 16:35:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D033A492C13; Tue, 9 May 2023 16:35:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9E0B119451C4; Tue, 9 May 2023 16:35:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B9BF19465BC for ; Tue, 9 May 2023 16:35:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3B57920268FD; Tue, 9 May 2023 16:35:34 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0A382026D16 for ; Tue, 9 May 2023 16:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683650230; 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=TAacvIseOx1WptkrcvCMTiY0H+6aChKgRGpH+40GlEc=; b=gk19XzFD7sBJGgMcA8IKgax4o57Ce6kI69oKCBXK8YZOWPtklUm3NryHVgi9WWcl2XGftV l71D3cpJd0tGspA1WsnXAeZx8W0tgqmoWcYeY4176nykQfWnY2ln4T4rW9SspHeI4m/+my xf+khCW4GEmjDH1AIkY0int8fxRYb7E= X-MC-Unique: 7Zm0qrwRPGaalEnVHylHIQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] qemuxml2argvtest: Use real caps instead of fake caps for 'audio-default-*' cases Date: Tue, 9 May 2023 18:35:29 +0200 Message-Id: <4a5fd35abb8271cff9a44601fbe05839cfaaecd6.1683650075.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683650233002100001 Content-Type: text/plain; charset="utf-8" Convert all of the 'audio-default-*' cases to use capabilities from qemu-4.2 instead of the fake caps. Signed-off-by: Peter Krempa --- ...default-sdl.args =3D> audio-default-sdl.x86_64-4.2.0.args} | 6 ++++-- ...ult-spice.args =3D> audio-default-spice.x86_64-4.2.0.args} | 6 ++++-- ...default-vnc.args =3D> audio-default-vnc.x86_64-4.2.0.args} | 6 ++++-- tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{audio-default-sdl.args =3D> audio-default-s= dl.x86_64-4.2.0.args} (86%) rename tests/qemuxml2argvdata/{audio-default-spice.args =3D> audio-default= -spice.x86_64-4.2.0.args} (86%) rename tests/qemuxml2argvdata/{audio-default-vnc.args =3D> audio-default-v= nc.x86_64-4.2.0.args} (86%) diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2= argvdata/audio-default-sdl.x86_64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/audio-default-sdl.args rename to tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args index 4fc9d3cd9a..7a45ba182f 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args @@ -11,8 +11,9 @@ SDL_AUDIODRIVER=3Desd \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -25,11 +26,12 @@ SDL_AUDIODRIVER=3Desd \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"sdl"}' \ -display sdl \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxm= l2argvdata/audio-default-spice.x86_64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/audio-default-spice.args rename to tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args index 30b93a54c7..9f344cef42 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -24,11 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2= argvdata/audio-default-vnc.x86_64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/audio-default-vnc.args rename to tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args index 3bb8de4a97..5aa7e82954 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -24,11 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-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 3100078b54..1da4aaec90 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -995,19 +995,19 @@ mymain(void) /* Validate auto-creation of