From nobody Mon Sep 8 02:34:22 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=1756139668; cv=none; d=zohomail.com; s=zohoarc; b=TNxm0gqzhoSvi+zUseMh1CgABKryw8YBOFAeTUGVOD38slRD1RzbEvweHgrCMpmmQn1jp8BCEIZlK05JwK5rRbOpgiPHFD9qJaHRkLjfn0Y1M49PHjjfdnEgmMYWKCkoXV8MrlcFJi27/8NfcyTBKybBVk0488YZE+0tv13NB7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756139668; 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=3mTlnKJB8XwGLCOCo4xCUVtgc2HLdBy5v1m7jMr4g8A=; b=N/39ieu1ikS/4omWBfNAGcjO+HKsFFP2shRA9ZmPyzv87sBcGMtESdla7A4l7ZPtJoQ23XatJX98Lh98cU5LE7bR4CL7S5o2DAHCBFmXUCfIuCbfwhwhpXucvyNB7jkqM9lmU3cVQ5EMFhgbb/fuWD5C6tg0c85t/cXwu2fQUPE= 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 175613966840496.78346940409074; Mon, 25 Aug 2025 09:34:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6E1A243EDE; Mon, 25 Aug 2025 12:34:27 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id A940544023; Mon, 25 Aug 2025 12:20:36 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4D18443E44; Mon, 25 Aug 2025 12:20:28 -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 AA9BE43E5D for ; Mon, 25 Aug 2025 12:19:50 -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-50-Ug78fOzHOV6rXpoi2h2z0g-1; Mon, 25 Aug 2025 12:19:48 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 C8B351956048 for ; Mon, 25 Aug 2025 16:19:47 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.68]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 05EDB30001A2 for ; Mon, 25 Aug 2025 16:19:46 +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=1756138790; 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=3mTlnKJB8XwGLCOCo4xCUVtgc2HLdBy5v1m7jMr4g8A=; b=QLQTMM8gZHyxJuazI4dDN1TiWISuBxVrpgtBTAm8cMr0dwSUv9oLbCvttYTAdnDAB1vhDu 6OpHCmp+3SUcrSxY5EE5WD33dVwZhRY3/TIUwbvESlrrJe4b3auvy1aQNJi7BfYUvaSlNL WsYXVAuHEV1ICnvkRSC8yAxjBBoETgM= X-MC-Unique: Ug78fOzHOV6rXpoi2h2z0g-1 X-Mimecast-MFC-AGG-ID: Ug78fOzHOV6rXpoi2h2z0g_1756138787 To: devel@lists.libvirt.org Subject: [PATCH v2 08/10] DONOTMERGE update firmware data Date: Mon, 25 Aug 2025 18:19:31 +0200 Message-ID: <20250825161933.228626-9-abologna@redhat.com> In-Reply-To: <20250825161933.228626-1-abologna@redhat.com> References: <20250825161933.228626-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yhBhwjwRX5xI9v-YZBl8580vo1ZcCDdFpxWW5LLqgY0_1756138787 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WCNYFJ6XELHULTCFIWF4CKX4EOVPOLCA X-Message-ID-Hash: WCNYFJ6XELHULTCFIWF4CKX4EOVPOLCA 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: 1756139670907116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Based on proposed changes in the Fedora edk2 package. The SEV(-ES) and SEV-SNP descriptors are now separate, which allows libvirt to pick the correct firmware loading mechanism (flash vs ROM) automatically. --- .../qemu/firmware/60-edk2-ovmf-x64-amdsev.json | 1 - .../qemu/firmware/60-edk2-ovmf-x64-amdsev.json | 3 +-- .../qemu/firmware/60-edk2-ovmf-x64-amdsevsnp.json} | 14 ++++++-------- tests/qemufirmwaretest.c | 2 ++ ...ware-auto-efi-sev-snp.x86_64-latest+amdsev.args | 5 ++--- ...mware-auto-efi-sev-snp.x86_64-latest+amdsev.xml | 2 +- ...unch-security-sev-snp.x86_64-latest+amdsev.args | 5 ++--- ...aunch-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 +- 10 files changed, 18 insertions(+), 23 deletions(-) copy tests/qemufirmwaredata/{out/usr/share/qemu/firmware/60-edk2-ovmf-x64-= amdsev.json =3D> usr/share/qemu/firmware/60-edk2-ovmf-x64-amdsevsnp.json} (= 57%) 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..2d3b821acb 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 @@ -21,7 +21,6 @@ "features": [ "amd-sev", "amd-sev-es", - "amd-sev-snp", "verbose-dynamic" ] } 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..ca88ef9176 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,5 +1,5 @@ { - "description": "OVMF with SEV-ES support", + "description": "OVMF with SEV + SEV-ES support", "interface-types": [ "uefi" ], @@ -22,7 +22,6 @@ "features": [ "amd-sev", "amd-sev-es", - "amd-sev-snp", "verbose-dynamic" ], "tags": [ diff --git a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovm= f-x64-amdsev.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-= ovmf-x64-amdsevsnp.json similarity index 57% copy from tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x= 64-amdsev.json copy to tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x64-amd= sevsnp.json index d83d394ba7..99e51c3d00 100644 --- a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/60-edk2-ovmf-x64-a= mdsev.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-edk2-ovmf-x64-amdse= vsnp.json @@ -1,14 +1,11 @@ { + "description": "OVMF with 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": [ { @@ -19,9 +16,10 @@ } ], "features": [ - "amd-sev", - "amd-sev-es", "amd-sev-snp", "verbose-dynamic" + ], + "tags": [ + ] } diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index a4fb5c9b9c..c18ee85c0a 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -100,6 +100,7 @@ testFWPrecedence(const void *opaque G_GNUC_UNUSED) PREFIX "/share/qemu/firmware/53-edk2-aarch64-verbose-raw.json", SYSCONFDIR "/qemu/firmware/59-combined.json", PREFIX "/share/qemu/firmware/60-edk2-ovmf-x64-amdsev.json", + PREFIX "/share/qemu/firmware/60-edk2-ovmf-x64-amdsevsnp.json", PREFIX "/share/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json", PREFIX "/share/qemu/firmware/90-combined.json", PREFIX "/share/qemu/firmware/91-bios.json", @@ -279,6 +280,7 @@ mymain(void) DO_PARSE_TEST("usr/share/qemu/firmware/52-edk2-aarch64-verbose-qcow2.j= son"); 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-amdsevsnp.json= "); DO_PARSE_TEST("usr/share/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json"= ); DO_PARSE_TEST("usr/share/qemu/firmware/90-combined.json"); DO_PARSE_TEST("usr/share/qemu/firmware/91-bios.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/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 --=20 2.51.0