From nobody Sun Oct 5 01:47:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1757513863; cv=none; d=zohomail.com; s=zohoarc; b=kOJBxw+o4CA7P/bTTjxlaojTrepoUAGyco4uIVVjhAEh3AWe6UupCAcvUkiO2rpJAHY+TFVHl3EzG8D/c5trfucH4iUUIjqgNc8kkC+x0Bz17f2iYtu5HxGlzBM7HfAYROSdn8B7cEbkRObG/HE47bXpD/+IA3TN7cjK+fXDAOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757513863; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=uKidSAyvjS+sVaCzdhzjA3q7jUxqviCDLNuGlUwUWfs=; b=jVWrSfqXwP62+4xmNBviAvCQrjrfv36+RwU5RaeIkyVnH2JTBg95oRcmGEtL5bXCKCJDiniLXAW+ih61kb9R4WPYLZpQB8VHcrfyX4p76w3tLVsJXsaX+nAzJowJ+Xmxt8HmmNaWaMVBUGI7C4K9bOQWYaWvZ80H8R6BqCE65ps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1757513863126950.2015751452774; Wed, 10 Sep 2025 07:17:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3299243F73; Wed, 10 Sep 2025 10:17:39 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0DB864412D; Wed, 10 Sep 2025 10:00:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 492C841915; Wed, 10 Sep 2025 10:00:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B556F41C9A for ; Wed, 10 Sep 2025 09:58:04 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-272-eFES-ZSwPt2M7kSsrM5mag-1; Wed, 10 Sep 2025 09:58:02 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1253719560B3 for ; Wed, 10 Sep 2025 13:58:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.226.29]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 070101800451 for ; Wed, 10 Sep 2025 13:58:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757512684; h=from:from: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; bh=uKidSAyvjS+sVaCzdhzjA3q7jUxqviCDLNuGlUwUWfs=; b=JDyuBG/1nvismSBX6YtLAHfCbILPJ0Kzze0jLNb8ADFanGT9y3VvNrhCOPFj+Mtpa6Lboo 1NeSh7OIzdvAf8XJEloNPkH5cEuZ6KS0YA1TSgVKFDZfuSqVwooPeWS0g/EYDb25xTMzfT W/rwVjFh1rt2ozuMppV52ePh1ZoNFx0= X-MC-Unique: eFES-ZSwPt2M7kSsrM5mag-1 X-Mimecast-MFC-AGG-ID: eFES-ZSwPt2M7kSsrM5mag_1757512682 To: devel@lists.libvirt.org Subject: [PATCH v3 8/9] DONOTMERGE update firmware data Date: Wed, 10 Sep 2025 15:57:46 +0200 Message-ID: <20250910135747.803614-9-abologna@redhat.com> In-Reply-To: <20250910135747.803614-1-abologna@redhat.com> References: <20250910135747.803614-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iEB77fp9vUuoPpnrOEbAlXisOL7x2IxgnenUY9IW-qw_1757512682 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JWT6B7KQRAQES775UTEKE4LQL3YQGBCZ X-Message-ID-Hash: JWT6B7KQRAQES775UTEKE4LQL3YQGBCZ X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1757513866774116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Based on proposed changes in the Fedora edk2 package: https://src.fedoraproject.org/rpms/edk2/pull-request/14 A new firmware descriptor exists for the stateful SEV use case, and the regular edk2 descriptor no longer advertises support for SEV/SEV-ES. Additionally, all stateless SEV use cases are now using the rom loader instead of the pflash one. --- .../share/qemu/firmware/60-edk2-ovmf-x64-amdsev.json | 8 ++------ .../30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json | 3 +-- .../firmware/31-edk2-ovmf-2m-raw-x64-sb-enrolled.json | 3 +-- .../qemu/firmware/40-edk2-ovmf-4m-qcow2-x64-sb.json | 3 +-- .../qemu/firmware/41-edk2-ovmf-2m-raw-x64-sb.json | 3 +-- .../share/qemu/firmware/50-edk2-aarch64-qcow2.json | 4 +--- .../usr/share/qemu/firmware/50-edk2-loongarch64.json | 2 ++ .../qemu/firmware/50-edk2-ovmf-4m-qcow2-x64-nosb.json | 5 +---- .../usr/share/qemu/firmware/50-edk2-riscv-qcow2.json | 4 +--- .../usr/share/qemu/firmware/51-edk2-aarch64-raw.json | 4 +--- .../qemu/firmware/51-edk2-ovmf-2m-raw-x64-nosb.json | 5 +---- .../qemu/firmware/52-edk2-aarch64-verbose-qcow2.json | 3 +-- .../qemu/firmware/53-edk2-aarch64-verbose-raw.json | 3 +-- .../share/qemu/firmware/60-edk2-ovmf-x64-amdsev.json | 11 +++-------- .../qemu/firmware/60-edk2-ovmf-x64-inteltdx.json | 1 - ...osb.json =3D> 61-edk2-ovmf-x64-amdsev-stateful.json} | 7 ++----- .../usr/share/qemu/firmware/90-combined.json | 1 - tests/qemufirmwaretest.c | 2 ++ ...irmware-auto-efi-sev-snp.x86_64-latest+amdsev.args | 5 ++--- ...firmware-auto-efi-sev-snp.x86_64-latest+amdsev.xml | 2 +- .../firmware-auto-efi-sev.x86_64-latest+amdsev.args | 6 ++---- .../firmware-auto-efi-sev.x86_64-latest+amdsev.xml | 3 +-- .../firmware-auto-efi-stateless.x86_64-latest.args | 5 ++--- .../firmware-auto-efi-stateless.x86_64-latest.xml | 2 +- ...ev-missing-platform-info.x86_64-latest+amdsev.args | 5 ++--- ...sev-missing-platform-info.x86_64-latest+amdsev.xml | 2 +- .../launch-security-sev-snp.x86_64-latest+amdsev.args | 5 ++--- .../launch-security-sev-snp.x86_64-latest+amdsev.xml | 2 +- .../launch-security-sev-snp.x86_64-latest.args | 5 ++--- .../launch-security-sev-snp.x86_64-latest.xml | 2 +- .../launch-security-sev.x86_64-latest+amdsev.args | 5 ++--- .../launch-security-sev.x86_64-latest+amdsev.xml | 2 +- 32 files changed, 43 insertions(+), 80 deletions(-) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{51-edk2-ovmf-2m-raw-x= 64-nosb.json =3D> 61-edk2-ovmf-x64-amdsev-stateful.json} (81%) diff --git a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovm= f-x64-amdsev.json b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-e= dk2-ovmf-x64-amdsev.json index d83d394ba7..e53e1213e6 100644 --- a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-a= mdsev.json +++ b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-a= mdsev.json @@ -3,12 +3,8 @@ "uefi" ], "mapping": { - "device": "flash", - "mode": "stateless", - "executable": { - "filename": "/usr/share/edk2/ovmf/OVMF.amdsev.fd", - "format": "raw" - } + "device": "memory", + "filename": "/usr/share/edk2/ovmf/OVMF.amdsev.fd" }, "targets": [ { diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/30-edk2-ovmf-4m= -qcow2-x64-sb-enrolled.json b/tests/qemufirmwaredata/usr/share/qemu/firmwar= e/30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json index e709223313..b899d104e0 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/30-edk2-ovmf-4m-qcow2-= x64-sb-enrolled.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/30-edk2-ovmf-4m-qcow2-= x64-sb-enrolled.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2", "format": "qcow2" @@ -31,6 +31,5 @@ "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/31-edk2-ovmf-2m= -raw-x64-sb-enrolled.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/= 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json index 2ed45362c4..61eb80ca20 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/31-edk2-ovmf-2m-raw-x6= 4-sb-enrolled.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/31-edk2-ovmf-2m-raw-x6= 4-sb-enrolled.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd", "format": "raw" @@ -31,6 +31,5 @@ "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/40-edk2-ovmf-4m= -qcow2-x64-sb.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/40-edk2= -ovmf-4m-qcow2-x64-sb.json index 655dd42ef1..89da929062 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/40-edk2-ovmf-4m-qcow2-= x64-sb.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/40-edk2-ovmf-4m-qcow2-= x64-sb.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2", "format": "qcow2" @@ -30,6 +30,5 @@ "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/41-edk2-ovmf-2m= -raw-x64-sb.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/41-edk2-o= vmf-2m-raw-x64-sb.json index 06b3ece89a..0b61f44956 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/41-edk2-ovmf-2m-raw-x6= 4-sb.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/41-edk2-ovmf-2m-raw-x6= 4-sb.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd", "format": "raw" @@ -30,6 +30,5 @@ "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-aarch64= -qcow2.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-aarch6= 4-qcow2.json index 79f64a11a3..39a9073f8e 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-aarch64-qcow2.= json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-aarch64-qcow2.= json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.qc= ow2", "format": "qcow2" @@ -24,9 +24,7 @@ } ], "features": [ - ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongar= ch64.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarc= h64.json index c5a7ec5f7b..96e4d82a8f 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarch64.js= on +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-loongarch64.js= on @@ -24,5 +24,7 @@ } ], "features": [ + ], + "tags": [ ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-ovmf-4m= -qcow2-x64-nosb.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-ed= k2-ovmf-4m-qcow2-x64-nosb.json index d64735f477..85cc1f78d1 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-ovmf-4m-qcow2-= x64-nosb.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-ovmf-4m-qcow2-= x64-nosb.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2", "format": "qcow2" @@ -26,11 +26,8 @@ ], "features": [ "acpi-s3", - "amd-sev", - "amd-sev-es", "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-riscv-q= cow2.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-riscv-qc= ow2.json index eb1930da49..19ef29a2cd 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-riscv-qcow2.js= on +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-riscv-qcow2.js= on @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/riscv/RISCV_VIRT_CODE.qcow2", "format": "qcow2" @@ -25,9 +25,7 @@ } ], "features": [ - ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-aarch64= -raw.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-aarch64-= raw.json index cabbd396ea..f567a41933 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-aarch64-raw.js= on +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-aarch64-raw.js= on @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.ra= w", "format": "raw" @@ -24,9 +24,7 @@ } ], "features": [ - ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-ovmf-2m= -raw-x64-nosb.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2= -ovmf-2m-raw-x64-nosb.json index 050853e2b8..f1a7f97253 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-ovmf-2m-raw-x6= 4-nosb.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-ovmf-2m-raw-x6= 4-nosb.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd", "format": "raw" @@ -26,11 +26,8 @@ ], "features": [ "acpi-s3", - "amd-sev", - "amd-sev-es", "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/52-edk2-aarch64= -verbose-qcow2.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/52-edk= 2-aarch64-verbose-qcow2.json index 4173102967..02bc53862f 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/52-edk2-aarch64-verbos= e-qcow2.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/52-edk2-aarch64-verbos= e-qcow2.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.qcow2", "format": "qcow2" @@ -27,6 +27,5 @@ "verbose-static" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/53-edk2-aarch64= -verbose-raw.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/53-edk2-= aarch64-verbose-raw.json index ec69d19858..59439af322 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/53-edk2-aarch64-verbos= e-raw.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/53-edk2-aarch64-verbos= e-raw.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw", "format": "raw" @@ -27,6 +27,5 @@ "verbose-static" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x6= 4-amdsev.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf= -x64-amdsev.json index 9a561bc7eb..5c8bfc0ffd 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x64-amdse= v.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x64-amdse= v.json @@ -1,15 +1,11 @@ { - "description": "OVMF with SEV-ES support", + "description": "OVMF with SEV + SEV-ES + SEV-SNP support", "interface-types": [ "uefi" ], "mapping": { - "device": "flash", - "mode": "stateless", - "executable": { - "filename": "/usr/share/edk2/ovmf/OVMF.amdsev.fd", - "format": "raw" - } + "device": "memory", + "filename": "/usr/share/edk2/ovmf/OVMF.amdsev.fd" }, "targets": [ { @@ -26,6 +22,5 @@ "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x6= 4-inteltdx.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ov= mf-x64-inteltdx.json index 445eb70e03..52323b2a04 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x64-intel= tdx.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x64-intel= tdx.json @@ -22,6 +22,5 @@ "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-ovmf-2m= -raw-x64-nosb.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/61-edk2= -ovmf-x64-amdsev-stateful.json similarity index 81% copy from tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-ovmf-2m-ra= w-x64-nosb.json copy to tests/qemufirmwaredata/usr/share/qemu/firmware/61-edk2-ovmf-x64-amd= sev-stateful.json index 050853e2b8..f1194a3d37 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/51-edk2-ovmf-2m-raw-x6= 4-nosb.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/61-edk2-ovmf-x64-amdse= v-stateful.json @@ -1,11 +1,11 @@ { - "description": "OVMF without SB+SMM, empty varstore", + "description": "OVMF with SEV + SEV-ES support, stateful", "interface-types": [ "uefi" ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd", "format": "raw" @@ -19,18 +19,15 @@ { "architecture": "x86_64", "machines": [ - "pc-i440fx-*", "pc-q35-*" ] } ], "features": [ - "acpi-s3", "amd-sev", "amd-sev-es", "verbose-dynamic" ], "tags": [ - ] } diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.jso= n b/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json index 8ecac440b4..a788a3fc40 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json @@ -21,7 +21,6 @@ ], "features": [ "acpi-s3", - "amd-sev", "enrolled-keys", "requires-smm", "secure-boot", diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index a4fb5c9b9c..dfb7d18f5d 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -101,6 +101,7 @@ testFWPrecedence(const void *opaque G_GNUC_UNUSED) SYSCONFDIR "/qemu/firmware/59-combined.json", PREFIX "/share/qemu/firmware/60-edk2-ovmf-x64-amdsev.json", PREFIX "/share/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json", + PREFIX "/share/qemu/firmware/61-edk2-ovmf-x64-amdsev-stateful.json= ", PREFIX "/share/qemu/firmware/90-combined.json", PREFIX "/share/qemu/firmware/91-bios.json", PREFIX "/share/qemu/firmware/93-invalid.json", @@ -280,6 +281,7 @@ mymain(void) DO_PARSE_TEST("usr/share/qemu/firmware/53-edk2-aarch64-verbose-raw.jso= n"); DO_PARSE_TEST("usr/share/qemu/firmware/60-edk2-ovmf-x64-amdsev.json"); DO_PARSE_TEST("usr/share/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json"= ); + DO_PARSE_TEST("usr/share/qemu/firmware/61-edk2-ovmf-x64-amdsev-statefu= l.json"); DO_PARSE_TEST("usr/share/qemu/firmware/90-combined.json"); DO_PARSE_TEST("usr/share/qemu/firmware/91-bios.json"); DO_PARSE_FAILURE_TEST("usr/share/qemu/firmware/93-invalid.json"); diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+= amdsev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest= +amdsev.args index 99350f600c..624039d1a2 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.= args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.= args @@ -10,11 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest= /.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,confidential-guest-support=3Dlsec0,pflash0=3Dlibvirt-pflash0-format,acpi= =3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,confidential-guest-support=3Dlsec0,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+= amdsev.xml b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+= amdsev.xml index 6ea58f3361..10a1a3a22d 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.= xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.= xml @@ -10,7 +10,7 @@ - /usr/share/edk2/ovmf/OVMF.amdsev.fd + /usr/share/edk2/ovmf/OVMF.amdsev.f= d diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amds= ev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.= args index 550ac52b8a..2529f9c069 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args @@ -10,12 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest= /.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,confidential-guest-support=3Dlsec0,pflash0=3Dlibvirt-pflash0-format,pfla= sh1=3Dlibvirt-pflash1-storage,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,confidential-guest-support=3Dlsec0,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amds= ev.xml b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.x= ml index cbfdcdeee3..96468a6943 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.xml @@ -10,8 +10,7 @@ - /usr/share/edk= 2/ovmf/OVMF_CODE.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /usr/share/edk2/ovmf/OVMF.amdsev.f= d diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-lates= t.args b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.ar= gs index 0c0caf2468..9bb122c04a 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args @@ -10,11 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest= /.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ +-machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-lates= t.xml b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml index 3fead35a66..da15c12e61 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.xml @@ -10,7 +10,7 @@ - /usr/share/edk2/ovmf/OVMF.amdsev.fd + /usr/share/edk2/= ovmf/OVMF.amdsev.fd diff --git a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-inf= o.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/launch-security-sev-mis= sing-platform-info.x86_64-latest+amdsev.args index 6e076cec63..a751ac70c8 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_6= 4-latest+amdsev.args +++ b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_6= 4-latest+amdsev.args @@ -10,11 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,pflash0=3Dlibvirt-pflash0-format,acpi= =3Don \ +-machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-inf= o.x86_64-latest+amdsev.xml b/tests/qemuxmlconfdata/launch-security-sev-miss= ing-platform-info.x86_64-latest+amdsev.xml index d0f8ed031d..d3c4aca1a0 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_6= 4-latest+amdsev.xml +++ b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_6= 4-latest+amdsev.xml @@ -10,7 +10,7 @@ - /usr/share/edk2/ovmf/OVMF.amdsev.fd + /usr/share/edk2/= ovmf/OVMF.amdsev.fd diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+am= dsev.args b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amd= sev.args index d849eb88e0..f8bc8a71fe 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.ar= gs +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.ar= gs @@ -10,11 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,pflash0=3Dlibvirt-pflash0-format,acpi= =3Don \ +-machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+am= dsev.xml b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amds= ev.xml index a0487b021e..f57f3f2b68 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.xml +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.xml @@ -10,7 +10,7 @@ - /usr/share/edk2/ovmf/OVMF.amdsev.fd + /usr/share/edk2/= ovmf/OVMF.amdsev.fd diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args index d849eb88e0..f8bc8a71fe 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args @@ -10,11 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,pflash0=3Dlibvirt-pflash0-format,acpi= =3Don \ +-machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xm= l b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml index a0487b021e..f57f3f2b68 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.xml @@ -10,7 +10,7 @@ - /usr/share/edk2/ovmf/OVMF.amdsev.fd + /usr/share/edk2/= ovmf/OVMF.amdsev.fd diff --git a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev= .args b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args index b62961f974..51a92dc47c 100644 --- a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args +++ b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args @@ -10,11 +10,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.amdsev.f= d","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"u= nmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,pflash0=3Dlibvirt-pflash0-format,acpi= =3Don \ +-machine pc-q35-8.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,confidential-guest-support=3Dlsec0,acpi=3Don \ -accel kvm \ -cpu qemu64 \ +-bios /usr/share/edk2/ovmf/OVMF.amdsev.fd \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev= .xml b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.xml index b7ec804058..9f46eec07d 100644 --- a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.xml +++ b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.xml @@ -10,7 +10,7 @@ - /usr/share/edk2/ovmf/OVMF.amdsev.fd + /usr/share/edk2/= ovmf/OVMF.amdsev.fd --=20 2.51.0