From nobody Mon Feb 9 16:51:06 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=1656000923; cv=none; d=zohomail.com; s=zohoarc; b=GGnDm9WTs5AvOenUpGN7KQsVifSHlHnvBXMRJUEldRbD9EXGbsetvnc6yN95SyHWpVWihCAIsLk2776F5Cgju+spK0Sw6SxsoaS0P2RSwC0UkeC9WEtk1zqlrbb6Cz4RD+SsKe5VMExoPTlBJkFHGEQ50sJZMR3hy0Fivb59GEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656000923; 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=ilc1s3MnhRfRs3Ee/KhV6mm2ueAxtf+mGRDYxsNoZrY=; b=eyfeG84Q/cuKdy+CzrEA89PP3UXZ0DoylQ2dJDMkw1pTzyNaDzAueDWS5c2JFkAv2opT46jqzAK22hrEvo+APnS5S79oohrKlb3oYxMLOaTyr572GX56vgKBH0DTX2R8h2sLV1SznneNUicCj6X67EI0Z8FOdYfZOQnvDcGXaws= 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 16560009236961021.75932906313; Thu, 23 Jun 2022 09:15:23 -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-269-AcHxTHBgNb6ZDp2U2BRNIQ-1; Thu, 23 Jun 2022 12:15:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6CF08517C8; Thu, 23 Jun 2022 16:14:47 +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 8E90E1131D; Thu, 23 Jun 2022 16:14:47 +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 6AF23194B95A; Thu, 23 Jun 2022 16:14:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C3750194B959 for ; Thu, 23 Jun 2022 16:14:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B36251121319; Thu, 23 Jun 2022 16:14:45 +0000 (UTC) Received: from harajuku.homenet.telecomitalia.it (unknown [10.40.194.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D00A1121315 for ; Thu, 23 Jun 2022 16:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656000922; 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=ilc1s3MnhRfRs3Ee/KhV6mm2ueAxtf+mGRDYxsNoZrY=; b=MxfJmJBdei1c6W5z7OqM1C2pCqa0+DlX7kSgzbDKHTzwcFsMnbXdxBQvk12wZdB3nhBMg8 8/aHU99HrbO+IIy7DMIC9gBK5vcdtbnO9hyX4y1t2bFvvqQKfTgevNlaScMphHX9NM4v8Q 3WFfhVDOXD/nw+TNZRAlYi3s/I0w3nM= X-MC-Unique: AcHxTHBgNb6ZDp2U2BRNIQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 04/28] tests: Rename and reorganize firmware tests Date: Thu, 23 Jun 2022 18:14:16 +0200 Message-Id: <20220623161440.61653-5-abologna@redhat.com> In-Reply-To: <20220623161440.61653-1-abologna@redhat.com> References: <20220623161440.61653-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656000925713100005 Content-Type: text/plain; charset="utf-8" Group all tests related to firmware selection together and give them consistent names that leave room for further tests to be added in an upcoming commit. Signed-off-by: Andrea Bolognani --- tests/qemusecuritytest.c | 6 +-- ... =3D> firmware-auto-bios.x86_64-latest.args} | 0 ...rmware-bios.xml =3D> firmware-auto-bios.xml} | 0 ...ware-auto-efi-aarch64.aarch64-latest.args} | 0 ...-efi.xml =3D> firmware-auto-efi-aarch64.xml} | 0 ...auto-efi-loader-secure.x86_64-latest.args} | 0 ...ml =3D> firmware-auto-efi-loader-secure.xml} | 0 ...o-efi-no-enrolled-keys.x86_64-latest.args} | 0 ...=3D> firmware-auto-efi-no-enrolled-keys.xml} | 0 ...s =3D> firmware-auto-efi.x86_64-latest.args} | 0 ...firmware-efi.xml =3D> firmware-auto-efi.xml} | 0 ...anual-bios-rw-implicit.x86_64-latest.args} | 0 ...l =3D> firmware-manual-bios-rw-implicit.xml} | 0 ...irmware-manual-bios-rw.x86_64-latest.args} | 0 ...ram-rw.xml =3D> firmware-manual-bios-rw.xml} | 0 .../{bios.args =3D> firmware-manual-bios.args} | 0 .../{bios.xml =3D> firmware-manual-bios.xml} | 0 ... =3D> firmware-manual-efi-acpi-aarch64.args} | 0 ...l =3D> firmware-manual-efi-acpi-aarch64.xml} | 0 ...args =3D> firmware-manual-efi-acpi-q35.args} | 0 ...i.xml =3D> firmware-manual-efi-acpi-q35.xml} | 0 ...th.err =3D> firmware-manual-efi-no-path.err} | 0 ...th.xml =3D> firmware-manual-efi-no-path.xml} | 0 ...> firmware-manual-efi-noacpi-aarch64.args} | 0 ...=3D> firmware-manual-efi-noacpi-aarch64.xml} | 0 ...err =3D> firmware-manual-efi-noacpi-q35.err} | 0 ...xml =3D> firmware-manual-efi-noacpi-q35.xml} | 0 ...-manual-efi-nvram-file.x86_64-latest.args} | 0 ...xml =3D> firmware-manual-efi-nvram-file.xml} | 0 ...-efi-nvram-network-iscsi.x86_64-4.1.0.err} | 0 ...fi-nvram-network-iscsi.x86_64-latest.args} | 0 ...rmware-manual-efi-nvram-network-iscsi.xml} | 0 ...-efi-nvram-network-nbd.x86_64-latest.args} | 0 ...firmware-manual-efi-nvram-network-nbd.xml} | 0 ...ual-efi-nvram-template.x86_64-latest.args} | 0 ...=3D> firmware-manual-efi-nvram-template.xml} | 0 ...e.args =3D> firmware-manual-efi-secure.args} | 0 ...ure.xml =3D> firmware-manual-efi-secure.xml} | 0 ...os-nvram.args =3D> firmware-manual-efi.args} | 0 ...bios-nvram.xml =3D> firmware-manual-efi.xml} | 0 ...=3D> firmware-manual-noefi-acpi-aarch64.err} | 0 ...=3D> firmware-manual-noefi-acpi-aarch64.xml} | 0 ...gs =3D> firmware-manual-noefi-acpi-q35.args} | 0 ...xml =3D> firmware-manual-noefi-acpi-q35.xml} | 0 ...firmware-manual-noefi-noacpi-aarch64.args} | 0 ... firmware-manual-noefi-noacpi-aarch64.xml} | 0 ... =3D> firmware-manual-noefi-noacpi-q35.args} | 0 ...l =3D> firmware-manual-noefi-noacpi-q35.xml} | 0 tests/qemuxml2argvtest.c | 52 +++++++++---------- ...l =3D> firmware-auto-bios.x86_64-latest.xml} | 0 ...mware-auto-efi-aarch64.aarch64-latest.xml} | 0 ...-auto-efi-loader-secure.x86_64-latest.xml} | 0 ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 1 + ...ml =3D> firmware-auto-efi.x86_64-latest.xml} | 0 ...e-manual-efi-nvram-file.x86_64-latest.xml} | 0 ...efi-nvram-network-iscsi.x86_64-latest.xml} | 0 ...l-efi-nvram-network-nbd.x86_64-latest.xml} | 0 ...bios-nvram.xml =3D> firmware-manual-efi.xml} | 0 ...are-efi-no-enrolled-keys.x86_64-latest.xml | 1 - tests/qemuxml2xmltest.c | 20 +++---- 60 files changed, 39 insertions(+), 41 deletions(-) rename tests/qemuxml2argvdata/{os-firmware-bios.x86_64-latest.args =3D> fi= rmware-auto-bios.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{os-firmware-bios.xml =3D> firmware-auto-bio= s.xml} (100%) rename tests/qemuxml2argvdata/{aarch64-os-firmware-efi.aarch64-latest.args= =3D> firmware-auto-efi-aarch64.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-os-firmware-efi.xml =3D> firmware-a= uto-efi-aarch64.xml} (100%) rename tests/qemuxml2argvdata/{os-firmware-efi-secboot.x86_64-latest.args = =3D> firmware-auto-efi-loader-secure.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{os-firmware-efi-secboot.xml =3D> firmware-a= uto-efi-loader-secure.xml} (100%) rename tests/qemuxml2argvdata/{os-firmware-efi-no-enrolled-keys.x86_64-lat= est.args =3D> firmware-auto-efi-no-enrolled-keys.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{os-firmware-efi-no-enrolled-keys.xml =3D> f= irmware-auto-efi-no-enrolled-keys.xml} (100%) rename tests/qemuxml2argvdata/{os-firmware-efi.x86_64-latest.args =3D> fir= mware-auto-efi.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{os-firmware-efi.xml =3D> firmware-auto-efi.= xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-rw-implicit.x86_64-latest.args = =3D> firmware-manual-bios-rw-implicit.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-rw-implicit.xml =3D> firmware-ma= nual-bios-rw-implicit.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-rw.x86_64-latest.args =3D> firmw= are-manual-bios-rw.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-rw.xml =3D> firmware-manual-bios= -rw.xml} (100%) rename tests/qemuxml2argvdata/{bios.args =3D> firmware-manual-bios.args} (= 100%) rename tests/qemuxml2argvdata/{bios.xml =3D> firmware-manual-bios.xml} (10= 0%) rename tests/qemuxml2argvdata/{aarch64-acpi-uefi.args =3D> firmware-manual= -efi-acpi-aarch64.args} (100%) rename tests/qemuxml2argvdata/{aarch64-acpi-uefi.xml =3D> firmware-manual-= efi-acpi-aarch64.xml} (100%) rename tests/qemuxml2argvdata/{q35-acpi-uefi.args =3D> firmware-manual-efi= -acpi-q35.args} (100%) rename tests/qemuxml2argvdata/{q35-acpi-uefi.xml =3D> firmware-manual-efi-= acpi-q35.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-no-path.err =3D> firmware-manual= -efi-no-path.err} (100%) rename tests/qemuxml2argvdata/{bios-nvram-no-path.xml =3D> firmware-manual= -efi-no-path.xml} (100%) rename tests/qemuxml2argvdata/{aarch64-noacpi-uefi.args =3D> firmware-manu= al-efi-noacpi-aarch64.args} (100%) rename tests/qemuxml2argvdata/{aarch64-noacpi-uefi.xml =3D> firmware-manua= l-efi-noacpi-aarch64.xml} (100%) rename tests/qemuxml2argvdata/{q35-noacpi-uefi.err =3D> firmware-manual-ef= i-noacpi-q35.err} (100%) rename tests/qemuxml2argvdata/{q35-noacpi-uefi.xml =3D> firmware-manual-ef= i-noacpi-q35.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-file.x86_64-latest.args =3D> fir= mware-manual-efi-nvram-file.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-file.xml =3D> firmware-manual-ef= i-nvram-file.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-network-iscsi.x86_64-4.1.0.err = =3D> firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{bios-nvram-network-iscsi.x86_64-latest.args= =3D> firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-network-iscsi.xml =3D> firmware-= manual-efi-nvram-network-iscsi.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-network-nbd.x86_64-latest.args = =3D> firmware-manual-efi-nvram-network-nbd.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-network-nbd.xml =3D> firmware-ma= nual-efi-nvram-network-nbd.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-template.x86_64-latest.args =3D>= firmware-manual-efi-nvram-template.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-template.xml =3D> firmware-manua= l-efi-nvram-template.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram-secure.args =3D> firmware-manual= -efi-secure.args} (100%) rename tests/qemuxml2argvdata/{bios-nvram-secure.xml =3D> firmware-manual-= efi-secure.xml} (100%) rename tests/qemuxml2argvdata/{bios-nvram.args =3D> firmware-manual-efi.ar= gs} (100%) rename tests/qemuxml2argvdata/{bios-nvram.xml =3D> firmware-manual-efi.xml= } (100%) rename tests/qemuxml2argvdata/{aarch64-acpi-nouefi.err =3D> firmware-manua= l-noefi-acpi-aarch64.err} (100%) rename tests/qemuxml2argvdata/{aarch64-acpi-nouefi.xml =3D> firmware-manua= l-noefi-acpi-aarch64.xml} (100%) rename tests/qemuxml2argvdata/{q35-acpi-nouefi.args =3D> firmware-manual-n= oefi-acpi-q35.args} (100%) rename tests/qemuxml2argvdata/{q35-acpi-nouefi.xml =3D> firmware-manual-no= efi-acpi-q35.xml} (100%) rename tests/qemuxml2argvdata/{aarch64-noacpi-nouefi.args =3D> firmware-ma= nual-noefi-noacpi-aarch64.args} (100%) rename tests/qemuxml2argvdata/{aarch64-noacpi-nouefi.xml =3D> firmware-man= ual-noefi-noacpi-aarch64.xml} (100%) rename tests/qemuxml2argvdata/{q35-noacpi-nouefi.args =3D> firmware-manual= -noefi-noacpi-q35.args} (100%) rename tests/qemuxml2argvdata/{q35-noacpi-nouefi.xml =3D> firmware-manual-= noefi-noacpi-q35.xml} (100%) rename tests/qemuxml2xmloutdata/{os-firmware-bios.x86_64-latest.xml =3D> f= irmware-auto-bios.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{aarch64-os-firmware-efi.aarch64-latest.xm= l =3D> firmware-auto-efi-aarch64.aarch64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{os-firmware-efi-secboot.x86_64-latest.xml= =3D> firmware-auto-efi-loader-secure.x86_64-latest.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-= keys.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{os-firmware-efi.x86_64-latest.xml =3D> fi= rmware-auto-efi.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{bios-nvram-file.x86_64-latest.xml =3D> fi= rmware-manual-efi-nvram-file.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{bios-nvram-network-iscsi.x86_64-latest.xm= l =3D> firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{bios-nvram-network-nbd.x86_64-latest.xml = =3D> firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{bios-nvram.xml =3D> firmware-manual-efi.x= ml} (100%) delete mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-ke= ys.x86_64-latest.xml diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 4e2343b7d7..0596783b6c 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -237,9 +237,9 @@ mymain(void) DO_TEST_DOMAIN("memory-hotplug-nvdimm-pmem"); DO_TEST_DOMAIN("memory-hotplug-nvdimm-readonly"); DO_TEST_DOMAIN("net-vhostuser"); - DO_TEST_DOMAIN("os-firmware-bios"); - DO_TEST_DOMAIN("os-firmware-efi"); - DO_TEST_DOMAIN("os-firmware-efi-secboot"); + DO_TEST_DOMAIN("firmware-auto-bios"); + DO_TEST_DOMAIN("firmware-auto-efi"); + DO_TEST_DOMAIN("firmware-auto-efi-loader-secure"); DO_TEST_DOMAIN("pci-bridge-many-disks"); DO_TEST_DOMAIN("tseg-explicit-size"); DO_TEST_DOMAIN("usb-redir-unix"); diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/t= ests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/os-firmware-bios.xml b/tests/qemuxml2ar= gvdata/firmware-auto-bios.xml similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-bios.xml rename to tests/qemuxml2argvdata/firmware-auto-bios.xml diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.= args b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.a= rgs rename to tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.a= rgs diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.xml b/tests/qem= uxml2argvdata/firmware-auto-efi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-os-firmware-efi.xml rename to tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.ar= gs rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-lat= est.args diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml b/tests/qem= uxml2argvdata/firmware-auto-efi-loader-secure.xml similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-efi-secboot.xml rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64= -latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x8= 6_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-= latest.args rename to tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-= latest.args diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml b/= tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml rename to tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/te= sts/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/os-firmware-efi.xml b/tests/qemuxml2arg= vdata/firmware-auto-efi.xml similarity index 100% rename from tests/qemuxml2argvdata/os-firmware-efi.xml rename to tests/qemuxml2argvdata/firmware-auto-efi.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-rw-implicit.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.= args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-rw-implicit.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-la= test.args diff --git a/tests/qemuxml2argvdata/bios-nvram-rw-implicit.xml b/tests/qemu= xml2argvdata/firmware-manual-bios-rw-implicit.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-rw-implicit.xml rename to tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args b/test= s/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/bios-nvram-rw.xml b/tests/qemuxml2argvd= ata/firmware-manual-bios-rw.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-rw.xml rename to tests/qemuxml2argvdata/firmware-manual-bios-rw.xml diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/firm= ware-manual-bios.args similarity index 100% rename from tests/qemuxml2argvdata/bios.args rename to tests/qemuxml2argvdata/firmware-manual-bios.args diff --git a/tests/qemuxml2argvdata/bios.xml b/tests/qemuxml2argvdata/firmw= are-manual-bios.xml similarity index 100% rename from tests/qemuxml2argvdata/bios.xml rename to tests/qemuxml2argvdata/firmware-manual-bios.xml diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2= argvdata/firmware-manual-efi-acpi-aarch64.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-acpi-uefi.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml b/tests/qemuxml2a= rgvdata/firmware-manual-efi-acpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-acpi-uefi.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argv= data/firmware-manual-efi-acpi-q35.args similarity index 100% rename from tests/qemuxml2argvdata/q35-acpi-uefi.args rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.xml b/tests/qemuxml2argvd= ata/firmware-manual-efi-acpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-acpi-uefi.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-no-path.err b/tests/qemuxml2= argvdata/firmware-manual-efi-no-path.err similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-no-path.err rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.err diff --git a/tests/qemuxml2argvdata/bios-nvram-no-path.xml b/tests/qemuxml2= argvdata/firmware-manual-efi-no-path.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-no-path.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxm= l2argvdata/firmware-manual-efi-noacpi-aarch64.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-noacpi-uefi.args rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml b/tests/qemuxml= 2argvdata/firmware-manual-efi-noacpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/q35-noacpi-uefi.err b/tests/qemuxml2arg= vdata/firmware-manual-efi-noacpi-q35.err similarity index 100% rename from tests/qemuxml2argvdata/q35-noacpi-uefi.err rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err diff --git a/tests/qemuxml2argvdata/q35-noacpi-uefi.xml b/tests/qemuxml2arg= vdata/firmware-manual-efi-noacpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-noacpi-uefi.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args b/te= sts/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-late= st.args diff --git a/tests/qemuxml2argvdata/bios-nvram-file.xml b/tests/qemuxml2arg= vdata/firmware-manual-efi-nvram-file.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-file.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-4.1.0.e= rr b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= 4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-4.1.0.err rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x8= 6_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-latest.= args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_6= 4-latest.args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-latest.a= rgs rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x8= 6_64-latest.args diff --git a/tests/qemuxml2argvdata/bios-nvram-network-iscsi.xml b/tests/qe= muxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-network-iscsi.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-network-nbd.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-network-nbd.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_= 64-latest.args diff --git a/tests/qemuxml2argvdata/bios-nvram-network-nbd.xml b/tests/qemu= xml2argvdata/firmware-manual-efi-nvram-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-network-nbd.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args = b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.a= rgs similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-= latest.args diff --git a/tests/qemuxml2argvdata/bios-nvram-template.xml b/tests/qemuxml= 2argvdata/firmware-manual-efi-nvram-template.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-template.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2= argvdata/firmware-manual-efi-secure.args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-secure.args rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.args diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.xml b/tests/qemuxml2a= rgvdata/firmware-manual-efi-secure.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram-secure.xml rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.xml diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdat= a/firmware-manual-efi.args similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram.args rename to tests/qemuxml2argvdata/firmware-manual-efi.args diff --git a/tests/qemuxml2argvdata/bios-nvram.xml b/tests/qemuxml2argvdata= /firmware-manual-efi.xml similarity index 100% rename from tests/qemuxml2argvdata/bios-nvram.xml rename to tests/qemuxml2argvdata/firmware-manual-efi.xml diff --git a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.err b/tests/qemuxml= 2argvdata/firmware-manual-noefi-acpi-aarch64.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-acpi-nouefi.err rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err diff --git a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.xml b/tests/qemuxml= 2argvdata/firmware-manual-noefi-acpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-acpi-nouefi.xml rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2ar= gvdata/firmware-manual-noefi-acpi-q35.args similarity index 100% rename from tests/qemuxml2argvdata/q35-acpi-nouefi.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.xml b/tests/qemuxml2arg= vdata/firmware-manual-noefi-acpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-acpi-nouefi.xml rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args b/tests/qemu= xml2argvdata/firmware-manual-noefi-noacpi-aarch64.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.xml b/tests/qemux= ml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-noacpi-nouefi.xml rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2= argvdata/firmware-manual-noefi-noacpi-q35.args similarity index 100% rename from tests/qemuxml2argvdata/q35-noacpi-nouefi.args rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.xml b/tests/qemuxml2a= rgvdata/firmware-manual-noefi-noacpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-noacpi-nouefi.xml rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 48dd20458e..9aa22d5c06 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1188,29 +1188,39 @@ mymain(void) DO_TEST_NOCAPS("reboot-timeout-disabled"); DO_TEST_NOCAPS("reboot-timeout-enabled"); =20 - DO_TEST("bios", + DO_TEST("firmware-manual-bios", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("bios-nvram"); - DO_TEST_PARSE_ERROR_NOCAPS("bios-nvram-no-path"); - DO_TEST_CAPS_LATEST("bios-nvram-rw"); - DO_TEST_CAPS_LATEST("bios-nvram-rw-implicit"); - DO_TEST("bios-nvram-secure", + DO_TEST_NOCAPS("firmware-manual-efi"); + DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-rw"); + DO_TEST_CAPS_LATEST("firmware-manual-bios-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("bios-nvram-template"); - DO_TEST_CAPS_LATEST("bios-nvram-network-iscsi"); - DO_TEST_CAPS_VER_PARSE_ERROR("bios-nvram-network-iscsi", "4.1.0"); - DO_TEST_CAPS_LATEST("bios-nvram-network-nbd"); - DO_TEST_CAPS_LATEST("bios-nvram-file"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi"); + DO_TEST_CAPS_VER_PARSE_ERROR("firmware-manual-efi-nvram-network-iscsi"= , "4.1.0"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd"); + DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file"); =20 /* Make sure all combinations of ACPI and UEFI behave as expected */ - DO_TEST_NOCAPS("q35-acpi-uefi"); - DO_TEST_PARSE_ERROR_NOCAPS("q35-noacpi-uefi"); - DO_TEST_NOCAPS("q35-noacpi-nouefi"); - DO_TEST_NOCAPS("q35-acpi-nouefi"); + 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_LATEST("firmware-auto-bios"); + DO_TEST_CAPS_LATEST("firmware-auto-efi"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-no-enrolled-keys"); + DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64"); =20 DO_TEST_NOCAPS("clock-utc"); DO_TEST_NOCAPS("clock-localtime"); @@ -3018,12 +3028,6 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_SERIAL); =20 - /* Make sure all combinations of ACPI and UEFI behave as expected */ - DO_TEST_NOCAPS("aarch64-acpi-uefi"); - DO_TEST_NOCAPS("aarch64-noacpi-uefi"); - DO_TEST_NOCAPS("aarch64-noacpi-nouefi"); - DO_TEST_PARSE_ERROR_NOCAPS("aarch64-acpi-nouefi"); - /* QEMU 4.0.0 didn't have support for aarch64 CPU features */ DO_TEST_CAPS_ARCH_VER_FAILURE("aarch64-features-sve", "aarch64", "4.0.= 0"); /* aarch64 doesn't support the same CPU features as x86 */ @@ -3408,12 +3412,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64"); =20 - DO_TEST_CAPS_LATEST("os-firmware-bios"); - DO_TEST_CAPS_LATEST("os-firmware-efi"); - DO_TEST_CAPS_LATEST("os-firmware-efi-secboot"); - DO_TEST_CAPS_LATEST("os-firmware-efi-no-enrolled-keys"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64"); - DO_TEST_CAPS_LATEST("vhost-user-vga"); DO_TEST_CAPS_LATEST("vhost-user-gpu-secondary"); =20 diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/= tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-lates= t.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.x= ml similarity index 100% rename from tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest= .xml rename to tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest= .xml diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-late= st.xml similarity index 100% rename from tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.= xml rename to tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-l= atest.xml diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x8= 6_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-ke= ys.x86_64-latest.xml new file mode 120000 index 0000000000..f954b0c4e1 --- /dev/null +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-la= test.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/t= ests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/bios-nvram-file.x86_64-latest.xml b/t= ests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/bios-nvram-file.x86_64-latest.xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-la= test.xml diff --git a/tests/qemuxml2xmloutdata/bios-nvram-network-iscsi.x86_64-lates= t.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x8= 6_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/bios-nvram-network-iscsi.x86_64-latest= .xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.= x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/bios-nvram-network-nbd.x86_64-latest.= xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64= -latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/bios-nvram-network-nbd.x86_64-latest.x= ml rename to tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x8= 6_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml b/tests/qemuxml2xmlout= data/firmware-manual-efi.xml similarity index 100% rename from tests/qemuxml2xmloutdata/bios-nvram.xml rename to tests/qemuxml2xmloutdata/firmware-manual-efi.xml diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_= 64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x= 86_64-latest.xml deleted file mode 120000 index 902ccb783b..0000000000 --- a/tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-late= st.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 714d36c0a0..fdcb17838b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1067,10 +1067,16 @@ mymain(void) DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT, QEMU_CAPS_OBJECT_MEMORY_= RAM); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); =20 - DO_TEST_NOCAPS("bios-nvram"); - DO_TEST_CAPS_LATEST("bios-nvram-network-iscsi"); - DO_TEST_CAPS_LATEST("bios-nvram-network-nbd"); - DO_TEST_CAPS_LATEST("bios-nvram-file"); + DO_TEST_NOCAPS("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"); + + DO_TEST_CAPS_LATEST("firmware-auto-bios"); + DO_TEST_CAPS_LATEST("firmware-auto-efi"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-no-enrolled-keys"); + DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64"); =20 DO_TEST_NOCAPS("tap-vhost"); DO_TEST_NOCAPS("tap-vhost-incorrect"); @@ -1081,15 +1087,9 @@ mymain(void) DO_TEST_NOCAPS("smbios-multiple-type2"); DO_TEST_NOCAPS("smbios-type-fwcfg"); =20 - DO_TEST_CAPS_LATEST("os-firmware-bios"); - DO_TEST_CAPS_LATEST("os-firmware-efi"); - DO_TEST_CAPS_LATEST("os-firmware-efi-secboot"); - DO_TEST_CAPS_LATEST("os-firmware-efi-no-enrolled-keys"); - DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64"); DO_TEST("aarch64-virtio-pci-default", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, --=20 2.35.3