From nobody Fri Nov 21 10:05:25 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 header.i=@fujitsu.com; 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=reject dis=none) header.from=aa.jp.fujitsu.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 176343489932680.01517861458728; Mon, 17 Nov 2025 19:01:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2611341BB4; Mon, 17 Nov 2025 22:01:38 -0500 (EST) Received: from [172.19.199.39] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 9CDAD41C95; Mon, 17 Nov 2025 22:00:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 4B39841B79; Mon, 17 Nov 2025 22:00:09 -0500 (EST) Received: from esa8.hc1455-7.c3s2.iphmx.com (esa8.hc1455-7.c3s2.iphmx.com [139.138.61.253]) (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 B84C34186D for ; Mon, 17 Nov 2025 22:00:06 -0500 (EST) Received: from unknown (HELO az2uksmgr3.o.css.fujitsu.com) ([52.151.125.128]) by esa8.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2025 11:59:01 +0900 Received: from az2uksmgm3.o.css.fujitsu.com (unknown [10.151.22.200]) (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 az2uksmgr3.o.css.fujitsu.com (Postfix) with ESMTPS id 37DE61002B83 for ; Tue, 18 Nov 2025 02:59:02 +0000 (UTC) Received: from az2nlsmom3.fujitsu.com (az2nlsmom3.o.css.fujitsu.com [10.150.26.199]) (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 az2uksmgm3.o.css.fujitsu.com (Postfix) with ESMTPS id E413EC0246B for ; Tue, 18 Nov 2025 02:59:01 +0000 (UTC) Received: from sm-arm-grace07.ssoft.mng.com (sm-x86-stp01.soft.fujitsu.com [10.124.178.20]) by az2nlsmom3.fujitsu.com (Postfix) with ESMTP id 0CC9A101A412; Tue, 18 Nov 2025 02:58:58 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,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 X-Greylist: delayed 62 seconds by postgrey-1.37 at lists.libvirt.org; Mon, 17 Nov 2025 22:00:06 EST DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1763434806; x=1794970806; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hkWp9RY7QkK99MPy3krfQ8Nwae8LWgOU+lzBLR3kTqw=; b=tfuLp8F8W7EufFfCVqAa1Im4eA6PMRf5Q53xpIIc8CO6/S13R2rMxa6W iS5Lr8nfmIaOAkCmr9gwYa7q8F8wkJJoWy32uH+Lq7C6E0o8OZJ+ZtGA4 QsvoR1kwzTZi/Wx42HEmIvpNFtAa8YqzzDkEJ4Ku+5/4hC0x/YakG/jU2 IdJ3BkH20hKR7wcVkefX1q779o8GdRnLzvOaBsgAsBSeKMwLahdOV8o31 0FDk7oomlU7npLYlPFeqaycL1SzyZvvZWhVpJDd/cFoYVtpNEMrbSnis4 GZNVYiwkWuHvF//aU9aDcwvyetkTgeDyip94my540rMKGUkLZhRodE6hd g==; X-CSE-ConnectionGUID: GzglipWnR9mD8COYo+zHzg== X-CSE-MsgGUID: mI1G4pfARp2222D4gTqtgg== X-IronPort-AV: E=McAfee;i="6800,10657,11616"; a="207516311" X-IronPort-AV: E=Sophos;i="6.19,313,1754924400"; d="scan'208";a="207516311" From: Kazuhiro Abe To: devel@lists.libvirt.org Subject: [RFC PATCH] qemu_validate: Fix aarch64 ACPI firmware type check Date: Tue, 18 Nov 2025 11:58:13 +0900 Message-ID: <20251118025819.3446467-1-fj1078ii@aa.jp.fujitsu.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AII3X37F7AK7AR234LYWNCS7BIR5AL2P X-Message-ID-Hash: AII3X37F7AK7AR234LYWNCS7BIR5AL2P X-MailFrom: fj1078ii@aa.jp.fujitsu.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 CC: taketani.ryo@fujitsu.com, abologna@redhat.com 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1763434902707153000 Content-Type: text/plain; charset="utf-8" Although QEMU allows ACPI with UEFI firmware via the '-bios' option on aarch64, libvirt rejected such configurations through its validation. Therefore, the conditional statement was changed to allow the following settings: hvm /usr/share/qemu-efi-aarch64/QEMU_EFI.fd Specifying still results in error, as before. Signed-off-by: Kazuhiro Abe --- src/qemu/qemu_validate.c | 2 +- ...auto-bios-acpi-aarch64.aarch64-latest.err} | 0 .../firmware-auto-bios-acpi-aarch64.xml | 17 ++++++++++ ...ual-noefi-acpi-aarch64.aarch64-latest.args | 31 +++++++++++++++++++ ...nual-noefi-acpi-aarch64.aarch64-latest.xml | 29 +++++++++++++++++ tests/qemuxmlconftest.c | 3 +- 6 files changed, 80 insertions(+), 2 deletions(-) rename tests/qemuxmlconfdata/{firmware-manual-noefi-acpi-aarch64.aarch64-l= atest.err =3D> firmware-auto-bios-acpi-aarch64.aarch64-latest.err} (100%) create mode 100644 tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.x= ml create mode 100644 tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch6= 4.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch6= 4.aarch64-latest.xml diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3b0f2b50a5..263aaa25a2 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1341,7 +1341,7 @@ qemuValidateDomainDef(const virDomainDef *def, /* On aarch64, ACPI requires UEFI */ if (def->features[VIR_DOMAIN_FEATURE_ACPI] =3D=3D VIR_TRISTATE_SWITCH_= ON && def->os.arch =3D=3D VIR_ARCH_AARCH64 && - (def->os.firmware !=3D VIR_DOMAIN_OS_DEF_FIRMWARE_EFI && + (def->os.firmware =3D=3D VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS && !virDomainDefHasOldStyleUEFI(def))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ACPI requires UEFI on this architecture")); diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch= 64-latest.err b/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.aarch= 64-latest.err similarity index 100% rename from tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch6= 4-latest.err rename to tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.aarch64-lat= est.err diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml b/te= sts/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml new file mode 100644 index 0000000000..37c4efdb80 --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml @@ -0,0 +1,17 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1 + + hvm + + + + + + /usr/bin/qemu-system-aarch64 + + + + diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch= 64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.a= arch64-latest.args new file mode 100644 index 0000000000..fe79a7e746 --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-late= st.args @@ -0,0 +1,31 @@ +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-aarch64 \ +-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"}' \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,acpi=3Don \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-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-manual-noefi-acpi-aarch64.aarch= 64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aa= rch64-latest.xml new file mode 100644 index 0000000000..b713a65714 --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-late= st.xml @@ -0,0 +1,29 @@ + + guest + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1048576 + 1048576 + 1 + + hvm + + + + + + + + cortex-a15 + + + destroy + restart + destroy + + /usr/bin/qemu-system-aarch64 + + + + diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index dd55c1ef28..122e644caf 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1554,10 +1554,11 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-manual-efi-acpi-q35"); DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-noacpi-aarch64", "aarch6= 4"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-noacpi-q35"); - DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-manual-noefi-acpi-aarch= 64", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-acpi-aarch64", "aarch6= 4"); DO_TEST_CAPS_LATEST("firmware-manual-noefi-acpi-q35"); DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-noacpi-aarch64", "aarc= h64"); DO_TEST_CAPS_LATEST("firmware-manual-noefi-noacpi-q35"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-auto-bios-acpi-aarch64"= , "aarch64"); =20 /* Ensure that legacy firmware paths keep working */ DO_TEST_CAPS_LATEST("firmware-manual-efi-secboot-legacy-paths"); --=20 2.43.0