From nobody Mon Feb 9 21:21:35 2026 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=1676457767; cv=none; d=zohomail.com; s=zohoarc; b=PNkSpaReIB0ubVaQeINCQ5AEp/tKUixOF1eEcu/9i6rnknysZ2RD35jEqZMc/q17HQ6e6MFisf8S4eqvIl0b2SVh3ZYrU/K7ew38KwvKXgR365RJV4+M4O7bashzf6QQKPYsrBTCdxN8s51z0b6hHaCfK02ye7Ig04eoY5zgbNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457767; 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=gz2EJU+N4hB3Dh5JlXZ7iiL46QFNhEuNTOz6SIqG3qk=; b=BKJFVJHWh1GhI5gIuCQ3OR68mEniQow+yxc5tCNRWp7jpS204A3Wxjr5csbYLLCbLGsA5apGL9i8jl7b0HMk+S8rzH9B0zaNofd9mFMXY3izwCOD1Las9rzdB7LsuK60esJmUfbi4NrqxmB56Gji7ZN6BK6ka+je63WvC1e9inI= 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 1676457767457572.585198623547; Wed, 15 Feb 2023 02:42:47 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-T5NldXtUPw-2MjaFI6fQ3w-1; Wed, 15 Feb 2023 05:42:41 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F0412807D87; Wed, 15 Feb 2023 10:42:37 +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 5CE0C2166B30; Wed, 15 Feb 2023 10:42:37 +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 0A6E819466DF; Wed, 15 Feb 2023 10:42:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AAF661946595 for ; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9B9C1141510F; Wed, 15 Feb 2023 10:42:36 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05D071415108 for ; Wed, 15 Feb 2023 10:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457765; 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=gz2EJU+N4hB3Dh5JlXZ7iiL46QFNhEuNTOz6SIqG3qk=; b=Vgrydm21Ju3N5VAWb9Yykd4W+gbOQfChizmPQmAcDb3CRE++DF/Ov5gLWrSgVHHM8IA1hx uxxohifuZfdex+7VtlU7KObnAUPs1po/b8W3cilmGajALesJkQwEBXtUKqzlrzCRx+Vd1o B6P+5FiOEdmlyR2N3ytDZH0E9heqW8g= X-MC-Unique: T5NldXtUPw-2MjaFI6fQ3w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 05/33] tests: Move firmware tests to CAPS_LATEST Date: Wed, 15 Feb 2023 11:42:02 +0100 Message-Id: <20230215104230.980815-6-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.6 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: 1676457767810100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This is already the case for the vast majority, but a few are using explicit capabilities lists. Signed-off-by: Andrea Bolognani --- ...nual-bios-not-stateless.x86_64-latest.err} | 0 ...-manual-bios-stateless.x86_64-latest.args} | 7 ++-- ...> firmware-manual-bios.x86_64-latest.args} | 7 ++-- ...nual-efi-acpi-aarch64.aarch64-latest.args} | 7 ++-- ...re-manual-efi-acpi-q35.x86_64-latest.args} | 7 ++-- ...ware-manual-efi-no-path.x86_64-latest.err} | 0 ...al-efi-noacpi-aarch64.aarch64-latest.args} | 7 ++-- ...e-manual-efi-noacpi-q35.x86_64-latest.err} | 0 ...ware-manual-efi-secure.x86_64-latest.args} | 7 ++-- ...=3D> firmware-manual-efi.x86_64-latest.args} | 7 ++-- ...ual-noefi-acpi-aarch64.aarch64-latest.err} | 0 ...-manual-noefi-acpi-q35.x86_64-latest.args} | 7 ++-- ...-noefi-noacpi-aarch64.aarch64-latest.args} | 7 ++-- ...anual-noefi-noacpi-q35.x86_64-latest.args} | 7 ++-- tests/qemuxml2argvtest.c | 36 ++++++++----------- ...e-manual-bios-stateless.x86_64-latest.xml} | 3 ++ ...=3D> firmware-manual-bios.x86_64-latest.xml} | 3 ++ ... =3D> firmware-manual-efi.x86_64-latest.xml} | 3 ++ tests/qemuxml2xmltest.c | 6 ++-- 19 files changed, 76 insertions(+), 45 deletions(-) rename tests/qemuxml2argvdata/{firmware-manual-bios-not-stateless.err =3D>= firmware-manual-bios-not-stateless.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-stateless.args =3D> fi= rmware-manual-bios-stateless.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-bios.args =3D> firmware-man= ual-bios.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-aarch64.args =3D> = firmware-manual-efi-acpi-aarch64.aarch64-latest.args} (73%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.args =3D> firm= ware-manual-efi-acpi-q35.x86_64-latest.args} (75%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.err =3D> firmwa= re-manual-efi-no-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-aarch64.args =3D= > firmware-manual-efi-noacpi-aarch64.aarch64-latest.args} (73%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-q35.err =3D> fir= mware-manual-efi-noacpi-q35.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.args =3D> firmwa= re-manual-efi-secure.x86_64-latest.args} (76%) rename tests/qemuxml2argvdata/{firmware-manual-efi.args =3D> firmware-manu= al-efi.x86_64-latest.args} (75%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-aarch64.err =3D>= firmware-manual-noefi-acpi-aarch64.aarch64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-q35.args =3D> fi= rmware-manual-noefi-acpi-q35.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-aarch64.args = =3D> firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args} (65%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-q35.args =3D> = firmware-manual-noefi-noacpi-q35.x86_64-latest.args} (68%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios-stateless.xml =3D> f= irmware-manual-bios-stateless.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios.xml =3D> firmware-ma= nual-bios.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-efi.xml =3D> firmware-man= ual-efi.x86_64-latest.xml} (90%) diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err = b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-latest.e= rr similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err rename to tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-= latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args b/t= ests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-bios-stateless.args rename to tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-late= st.args index 3aa4fa90fa..20953097ef 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.a= rgs @@ -9,11 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.args b/tests/qemux= ml2argvdata/firmware-manual-bios.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-bios.args rename to tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args index 3aa4fa90fa..20953097ef 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args @@ -9,11 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args b= /tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args similarity index 73% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-l= atest.args index 411ac0ee7c..d6ed7b879c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-lates= t.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args b/tes= ts/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args similarity index 75% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest= .args index 641b7482ef..1d95deed9f 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-for= mat,pflash1=3Dlibvirt-pflash1-format \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflas= h0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.err b/tests= /qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.err rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.= err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args= b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest= .args similarity index 73% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64= -latest.args index 3dbd36f066..3ecd28d85e 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-lat= est.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -30,4 +32,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err b/te= sts/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-late= st.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests= /qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.args rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.a= rgs index 7a879c3822..d394efedd9 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args @@ -9,15 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlibvirt-pf= lash0-format,pflash1=3Dlibvirt-pflash1-format \ +-machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backend=3Dpc.= ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ +-cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -32,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.args b/tests/qemuxm= l2argvdata/firmware-manual-efi.x86_64-latest.args similarity index 75% rename from tests/qemuxml2argvdata/firmware-manual-efi.args rename to tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args index 1ee322bf08..9a0a941372 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args @@ -9,14 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-form= at,pflash1=3Dlibvirt-pflash1-format \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,pflash= 0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -no-shutdown \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err = b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.= err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64= -latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args b/t= ests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-late= st.args index 814396d3fc..18991fa32c 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.a= rgs @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.ar= gs b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-la= test.args similarity index 65% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch= 64-latest.args index b587534c49..fab02e14e2 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-l= atest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -26,4 +28,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args b= /tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-la= test.args index 4eff029173..089871f9fa 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest= .args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ +-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 f8ea0b6d10..885daff5f7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1120,23 +1120,15 @@ mymain(void) DO_TEST_NOCAPS("reboot-timeout-disabled"); DO_TEST_NOCAPS("reboot-timeout-enabled"); =20 - DO_TEST("firmware-manual-bios", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("firmware-manual-bios-stateless", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_PARSE_ERROR("firmware-manual-bios-not-stateless", - QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("firmware-manual-efi"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path"); + DO_TEST_CAPS_LATEST("firmware-manual-bios"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-bios-not-stateless"); + DO_TEST_CAPS_LATEST("firmware-manual-efi"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-no-path"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit"); - DO_TEST("firmware-manual-efi-secure", - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("firmware-manual-efi-secure"); DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-st= ateless"); @@ -1146,14 +1138,14 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-stateless"); =20 /* Make sure all combinations of ACPI and UEFI behave as expected */ - DO_TEST_NOCAPS("firmware-manual-efi-acpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-efi-acpi-q35"); - DO_TEST_NOCAPS("firmware-manual-efi-noacpi-aarch64"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-noacpi-q35"); - DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-noefi-acpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-noefi-acpi-q35"); - DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-aarch64"); - DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-acpi-aarch64", "aarch64"= ); + DO_TEST_CAPS_LATEST("firmware-manual-efi-acpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-noacpi-aarch64", "aarch6= 4"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-manual-noefi-acpi-aarch= 64", "aarch64"); + DO_TEST_CAPS_LATEST("firmware-manual-noefi-acpi-q35"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-noacpi-aarch64", "aarc= h64"); + DO_TEST_CAPS_LATEST("firmware-manual-noefi-noacpi-q35"); =20 DO_TEST_CAPS_LATEST("firmware-auto-bios"); DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless"); diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml b/= tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml rename to tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-la= test.xml index 2fb7b49a79..186df8c386 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest= .xml @@ -9,6 +9,9 @@ /usr/share/seabios/bios.bin + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml b/tests/qemu= xml2xmloutdata/firmware-manual-bios.x86_64-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/firmware-manual-bios.xml rename to tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml index 47432ac525..98b7becb2c 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml @@ -9,6 +9,9 @@ /usr/share/seabios/bios.bin + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmloutdata/firmware-manual-efi.xml b/tests/qemux= ml2xmloutdata/firmware-manual-efi.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/firmware-manual-efi.xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml index 7e6b3ad432..189f68cb1c 100644 --- a/tests/qemuxml2xmloutdata/firmware-manual-efi.xml +++ b/tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml @@ -13,6 +13,9 @@ + + qemu64 + destroy restart diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 907762190b..b242f1e9ac 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -937,9 +937,9 @@ mymain(void) DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); =20 - DO_TEST_NOCAPS("firmware-manual-bios"); - DO_TEST_NOCAPS("firmware-manual-bios-stateless"); - DO_TEST_NOCAPS("firmware-manual-efi"); + DO_TEST_CAPS_LATEST("firmware-manual-bios"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless"); + DO_TEST_CAPS_LATEST("firmware-manual-efi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file"); --=20 2.39.1