From nobody Thu Sep 19 00:56:52 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1720454081628911.3346927359976; Mon, 8 Jul 2024 08:54:41 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 98C7912D1; Mon, 8 Jul 2024 11:54:40 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6D845152C; Mon, 8 Jul 2024 11:52:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E036E12BC; Mon, 8 Jul 2024 11:52:05 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2A9E9126B for ; Mon, 8 Jul 2024 11:51:55 -0400 (EDT) Received: from mx-prod-mc-01.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-541-h05S9yQRO4i6WDw7QV68-A-1; Mon, 08 Jul 2024 11:51:53 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9A62A196CDF1 for ; Mon, 8 Jul 2024 15:51:52 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.122]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ACD4A3000181 for ; Mon, 8 Jul 2024 15:51:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720453914; 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=ijQnUqMP+iVqfYnNwBH/m9QyEgV0BtmCJ4uYKL6Qp2I=; b=h/W550hE6wsQD5SwoQ43bHPvx7yPdF/uPJUVWC6MIpUzFFoFPfUuhVWAvj7COJNizxMuU1 pToB7RARMuE39yXOG8ytzqRdnWm04cu394EJcrCOu/C9DegHVD4EqH9KYA69eXSI5Bp2dZ ualjgQfVh4kRH2IdBBKLiAnNGoVGlis= X-MC-Unique: h05S9yQRO4i6WDw7QV68-A-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 5/6] tests: Add firmware descriptor for edk2 on riscv64 Date: Mon, 8 Jul 2024 17:51:41 +0200 Message-ID: <20240708155142.91500-6-abologna@redhat.com> In-Reply-To: <20240708155142.91500-1-abologna@redhat.com> References: <20240708155142.91500-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-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: J7MURLZJKFWQPSFFPUPS44PKPOG5BNUP X-Message-ID-Hash: J7MURLZJKFWQPSFFPUPS44PKPOG5BNUP X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1720454082426100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It's available as part of the edk2-riscv64 Fedora package. Signed-off-by: Andrea Bolognani --- .../qemu_5.2.0-tcg-virt.riscv64.xml | 4 ++- .../qemu_5.2.0-virt.riscv64.xml | 4 ++- .../qemu_8.0.0-tcg-virt.riscv64.xml | 4 ++- .../qemu_8.0.0-virt.riscv64.xml | 4 ++- .../qemu/firmware/50-edk2-riscv-qcow2.json | 33 +++++++++++++++++++ tests/qemufirmwaretest.c | 5 +++ 6 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-= riscv-qcow2.json diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/d= omaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml index c487d467ef..e69fb88891 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml @@ -6,7 +6,9 @@ - + + efi + /obviously/fake/firmware1.fd /obviously/fake/firmware2.fd diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.riscv64.xml index b0e4aafcd5..e9a1883a14 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml @@ -5,7 +5,9 @@ riscv64 - + + efi + /obviously/fake/firmware1.fd /obviously/fake/firmware2.fd diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/d= omaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml index e4bb90c929..3915f789fe 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml @@ -6,7 +6,9 @@ - + + efi + /obviously/fake/firmware1.fd /obviously/fake/firmware2.fd diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domai= ncapsdata/qemu_8.0.0-virt.riscv64.xml index 265274aa65..ddcbac7192 100644 --- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml @@ -5,7 +5,9 @@ riscv64 - + + efi + /obviously/fake/firmware1.fd /obviously/fake/firmware2.fd 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 new file mode 100644 index 0000000000..eb1930da49 --- /dev/null +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-riscv-qcow2.js= on @@ -0,0 +1,33 @@ +{ + "description": "UEFI firmware for RISC-V virtual machines", + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode" : "split", + "executable": { + "filename": "/usr/share/edk2/riscv/RISCV_VIRT_CODE.qcow2", + "format": "qcow2" + }, + "nvram-template": { + "filename": "/usr/share/edk2/riscv/RISCV_VIRT_VARS.qcow2", + "format": "qcow2" + } + }, + "targets": [ + { + "architecture": "riscv64", + "machines": [ + "virt", + "virt-*" + ] + } + ], + "features": [ + + ], + "tags": [ + + ] +} diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index a5e7e2ec65..f16ea526ff 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -93,6 +93,7 @@ testFWPrecedence(const void *opaque G_GNUC_UNUSED) PREFIX "/share/qemu/firmware/50-edk2-loongarch64.json", PREFIX "/share/qemu/firmware/50-edk2-ovmf-4m-qcow2-x64-nosb.json", PREFIX "/share/qemu/firmware/50-edk2-ovmf-x64-microvm.json", + PREFIX "/share/qemu/firmware/50-edk2-riscv-qcow2.json", PREFIX "/share/qemu/firmware/51-edk2-aarch64-raw.json", PREFIX "/share/qemu/firmware/51-edk2-ovmf-2m-raw-x64-nosb.json", PREFIX "/share/qemu/firmware/52-edk2-aarch64-verbose-qcow2.json", @@ -272,6 +273,7 @@ mymain(void) DO_PARSE_TEST("usr/share/qemu/firmware/50-edk2-loongarch64.json"); DO_PARSE_TEST("usr/share/qemu/firmware/50-edk2-ovmf-4m-qcow2-x64-nosb.= json"); DO_PARSE_TEST("usr/share/qemu/firmware/50-edk2-ovmf-x64-microvm.json"); + DO_PARSE_TEST("usr/share/qemu/firmware/50-edk2-riscv-qcow2.json"); DO_PARSE_TEST("usr/share/qemu/firmware/51-edk2-aarch64-raw.json"); DO_PARSE_TEST("usr/share/qemu/firmware/51-edk2-ovmf-2m-raw-x64-nosb.js= on"); DO_PARSE_TEST("usr/share/qemu/firmware/52-edk2-aarch64-verbose-qcow2.j= son"); @@ -332,6 +334,9 @@ mymain(void) "/usr/share/edk2/aarch64/QEMU_EFI-pflash.qcow2:/usr/= share/edk2/aarch64/vars-template-pflash.qcow2:" "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/sh= are/edk2/aarch64/vars-template-pflash.raw", VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); + DO_SUPPORTED_TEST("virt", VIR_ARCH_RISCV64, false, + "/usr/share/edk2/riscv/RISCV_VIRT_CODE.qcow2:/usr/sh= are/edk2/riscv/RISCV_VIRT_VARS.qcow2", + VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); =20 virFileWrapperClearPrefixes(); =20 --=20 2.45.2