From nobody Thu Sep 19 01:07:54 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 1720454105477121.26959068099768; Mon, 8 Jul 2024 08:55:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 64E33939; Mon, 8 Jul 2024 11:55:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 51AE414FA; Mon, 8 Jul 2024 11:52:14 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C208212F9; Mon, 8 Jul 2024 11:52:09 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 8D6A712F9 for ; Mon, 8 Jul 2024 11:51:56 -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-468-OvlWx02CNF63TQz7V1E1Aw-1; Mon, 08 Jul 2024 11:51:54 -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 DDB521955F44 for ; Mon, 8 Jul 2024 15:51:53 +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 E9ACF3000181 for ; Mon, 8 Jul 2024 15:51:52 +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=1720453916; 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=tCO9THXzLCLA9Ln+27L39BSTPKtHWHnvjt98a8Nrcvk=; b=XFegvKHaw2zpJ6PW6GmNQFRVK9TagZW7LiyMcJEwmMfdwultQddekO5tWkogvUc9x9myvz x0jxfkony0jtXQS1CyAGIlLKgEbuZG0DQQWvf5Kj5o1tI+ohvJkR0PgvKo3YXwGxP0cprh FKPxdpJbw3hmmUPd6jZifhLhh1AqNdQ= X-MC-Unique: OvlWx02CNF63TQz7V1E1Aw-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 6/6] tests: Add test for UEFI autoselection on riscv64 Date: Mon, 8 Jul 2024 17:51:42 +0200 Message-ID: <20240708155142.91500-7-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: 7LWFPBJQXDUIJNNLOPD7RKAZIJUGAMG5 X-Message-ID-Hash: 7LWFPBJQXDUIJNNLOPD7RKAZIJUGAMG5 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: 1720454106498100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This scenario is going to be ever more popular, especially now that virt-manager has started using UEFI by default on riscv64 (see https://github.com/virt-manager/virt-manager/pull/670/). Signed-off-by: Andrea Bolognani --- ...efi-riscv64.riscv64-latest.abi-update.args | 34 +++++++++++++++++++ ...-efi-riscv64.riscv64-latest.abi-update.xml | 28 +++++++++++++++ .../firmware-auto-efi-riscv64.xml | 14 ++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 77 insertions(+) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64= -latest.abi-update.args create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64= -latest.abi-update.xml create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-riscv64.xml diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest= .abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-= latest.abi-update.args new file mode 100644 index 0000000000..942be6d73d --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-up= date.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-riscv64 \ +-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/riscv/RISCV_VIRT_C= ODE.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,"dis= card":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format= \ +-accel tcg \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":1073741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest= .abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-l= atest.abi-update.xml new file mode 100644 index 0000000000..45f581214e --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-up= date.xml @@ -0,0 +1,28 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1048576 + 1 + + hvm + + + + + /usr/share/e= dk2/riscv/RISCV_VIRT_CODE.qcow2 + /var/lib/libvirt/qemu/nvram/guest_VARS.qcow2 + + + + destroy + restart + destroy + + /usr/bin/qemu-system-riscv64 + + + + diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.xml b/tests/qe= muxmlconfdata/firmware-auto-efi-riscv64.xml new file mode 100644 index 0000000000..9904a50e25 --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.xml @@ -0,0 +1,14 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + + + /usr/bin/qemu-system-riscv64 + + + + diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 49b4d023b6..a215faae72 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1437,6 +1437,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-aarch64", "aarc= h64"); DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-loongarch64", "loongarch64= "); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-loongarch64", "= loongarch64"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-riscv64", "risc= v64"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-template"); DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-nvram-template-nonstand= ard"); --=20 2.45.2