From nobody Sat Nov 15 10:42:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1752665360; cv=pass; d=zohomail.com; s=zohoarc; b=ClHEjagexove2idip0fTzX20JqQOGcyXmEUUigesbLMs8iOdtKedg/W+CTZnUspG+5/Yc+vZASDTpHoUr0thc/MotkoqaIHEjQwSIObOnDtETYhHfzwu19Oy8UYUMylsdXilwR5cUcshrKTz2ANqR2mk3PUMt8rnI1jEno4g0wY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752665360; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PbWXELrNFK36KaZSrte+NesZIbPeFodr3uFNaBSeM1c=; b=Z00ZSFxrFGeRTnCKLswyKal0pwZAOueUr376eBVdXfnf0u8NNHEztaKksSRudWiTBc6HojEcY5SmR5mObztauUyElR+g2qcEOmkI0xYlAHAxAdXZ6numJTLwqKD+Y2xEGak+7LkhEJ9qSkX/AIwllOs1pLaeJnoIf0sqGc9PY1I= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752665360200751.658682443638; Wed, 16 Jul 2025 04:29:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uc0Hm-0006eg-W0; Wed, 16 Jul 2025 07:26:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0CD-0001l0-LS; Wed, 16 Jul 2025 07:21:09 -0400 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0CB-00013U-7B; Wed, 16 Jul 2025 07:21:09 -0400 Received: by mx.zohomail.com with SMTPS id 175266481068276.30808314738442; Wed, 16 Jul 2025 04:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1752664813; cv=none; d=zohomail.com; s=zohoarc; b=h56aqE1lIb4fXncE8zwikK5HSfeEQ27frip9S/5rz1s4+TAojxpIKXq2D+uFerkOUOZZ6IRu4DM9AT28YnM6qN5mjDLUfT3N2o5BI/tNlw73Tx3SKLR9Z9aY0VyVFmJHx7Xx2eMjH9cc1YGQTtKjeUtLZaOxgLPoFOxfvQCraBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752664813; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=PbWXELrNFK36KaZSrte+NesZIbPeFodr3uFNaBSeM1c=; b=IOAJ9X+mQYjZu6xNpcG+OcfoOvaXVXIiIR/QaNTLc9uDh2RT36YXFPhVWOfHTI+G+TaZko+r/NpL3XpGZ3j2jabVr+31bU6Cot9M94/QUd/eDafNVon4UUmjewKtRjk8otOikmV4c0wGW4vK9le7k5qqMeQpqORuoNnCmiYlovo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752664813; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=PbWXELrNFK36KaZSrte+NesZIbPeFodr3uFNaBSeM1c=; b=h47/argpBUdI3AXPYWmWqiB7+uk/6tPQPmfGRQg14THTlDNVE2viT4CunIBivE7B im4yz6hqBBzo/pg5eZJGHwGgUWSEhGKwgdzNZr4izDeyqkxzJNHpZ1RlDuv/R7cf2Em kEYcMO2orOrfNZSgRPPfceN0+Wxs8j0NZpzz40a4= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Cc: Bibo Mao , Gavin Shan Subject: [PATCH v5 1/4] acpi: Add machine option to disable SPCR table Date: Wed, 16 Jul 2025 19:19:53 +0800 Message-ID: <20250716111959.404917-2-me@linux.beauty> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250716111959.404917-1-me@linux.beauty> References: <20250716111959.404917-1-me@linux.beauty> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.112; envelope-from=me@linux.beauty; helo=sender4-pp-f112.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1752665361911116600 From: Li Chen The ACPI SPCR (Serial Port Console Redirection) table allows firmware to specify a preferred serial console device to the operating system. On ARM64 systems, Linux by default respects this table: even if the kernel command line does not include a hardware serial console (e.g., "console=3DttyAMA0"), the kernel still register the serial device referenced by SPCR as a printk console. While this behavior is standard-compliant, it can lead to situations where guest console behavior is influenced by platform firmware rather than user-specified configuration. To make guest console behavior more predictable and under user control, this patch introduces a machine option to explicitly disable SPCR table exposure: -machine spcr=3Doff By default, the option is enabled (spcr=3Don), preserving existing behavior. When disabled, QEMU will omit the SPCR table from the guest's ACPI namespace, ensuring that only consoles explicitly declared in the kernel command line are registered. Signed-off-by: Li Chen Reviewed-by: Bibo Mao Acked-by: Michael S. Tsirkin Reviewed-by: Gavin Shan Reviewed-by: Sunil V L --- Notes: Changes since v3: 1. Add Reviewed-by from Sunil V L 2. rename enable_spcr to acpi_spcr_enabled as suggested by Philippe Mathieu-Daud=C3=A9 Changes since V2: Add Reviewed-by from Gavin Shan for the first patch and fix style issue. Changes since V1: add Reviewed-by and Acked-by hw/arm/virt-acpi-build.c | 5 ++++- hw/core/machine.c | 22 ++++++++++++++++++++++ hw/loongarch/virt-acpi-build.c | 4 +++- hw/riscv/virt-acpi-build.c | 5 ++++- include/hw/boards.h | 1 + qemu-options.hx | 5 +++++ 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 0dfb8ec2c3..782b17b966 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -1023,7 +1023,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuil= dTables *tables) } =20 acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, vms); + + if (ms->acpi_spcr_enabled) { + spcr_setup(tables_blob, tables->linker, vms); + } =20 acpi_add_table(table_offsets, tables_blob); build_dbg2(tables_blob, tables->linker, vms); diff --git a/hw/core/machine.c b/hw/core/machine.c index e869821b22..ceee058cad 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -577,6 +577,20 @@ static void machine_set_nvdimm(Object *obj, bool value= , Error **errp) ms->nvdimms_state->is_enabled =3D value; } =20 +static bool machine_get_spcr(Object *obj, Error **errp) +{ + MachineState *ms =3D MACHINE(obj); + + return ms->acpi_spcr_enabled; +} + +static void machine_set_spcr(Object *obj, bool value, Error **errp) +{ + MachineState *ms =3D MACHINE(obj); + + ms->acpi_spcr_enabled =3D value; +} + static bool machine_get_hmat(Object *obj, Error **errp) { MachineState *ms =3D MACHINE(obj); @@ -1281,6 +1295,14 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } =20 + /* SPCR */ + ms->acpi_spcr_enabled =3D true; + object_property_add_bool(obj, "spcr", machine_get_spcr, machine_set_sp= cr); + object_property_set_description(obj, "spcr", + "Set on/off to enable/disable " + "ACPI Serial Port Console Redirection " + "Table (spcr)"); + /* default to mc->default_cpus */ ms->smp.cpus =3D mc->default_cpus; ms->smp.max_cpus =3D mc->default_cpus; diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c index 2cd2d9d842..8c2228a772 100644 --- a/hw/loongarch/virt-acpi-build.c +++ b/hw/loongarch/virt-acpi-build.c @@ -557,7 +557,9 @@ static void acpi_build(AcpiBuildTables *tables, Machine= State *machine) acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, machine); acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, machine); + + if (machine->acpi_spcr_enabled) + spcr_setup(tables_blob, tables->linker, machine); =20 if (machine->numa_state->num_nodes) { if (machine->numa_state->have_numa_distance) { diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 8b5683dbde..ee1416d264 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -894,7 +894,10 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBui= ldTables *tables) } =20 acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, s); + + if (ms->acpi_spcr_enabled) { + spcr_setup(tables_blob, tables->linker, s); + } =20 acpi_add_table(table_offsets, tables_blob); { diff --git a/include/hw/boards.h b/include/hw/boards.h index f424b2b505..f94713e6e2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -443,6 +443,7 @@ struct MachineState { SmpCache smp_cache; struct NVDIMMState *nvdimms_state; struct NumaState *numa_state; + bool acpi_spcr_enabled; }; =20 /* diff --git a/qemu-options.hx b/qemu-options.hx index 1f862b19a6..9b2d5f4b7a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " nvdimm=3Don|off controls NVDIMM support (default=3Dof= f)\n" " memory-encryption=3D@var{} memory encryption object t= o use (default=3Dnone)\n" " hmat=3Don|off controls ACPI HMAT support (default=3Do= ff)\n" + " spcr=3Don|off controls ACPI SPCR support (default=3Do= n)\n" #ifdef CONFIG_POSIX " aux-ram-share=3Don|off allocate auxiliary guest RAM a= s shared (default: off)\n" #endif @@ -105,6 +106,10 @@ SRST Enables or disables ACPI Heterogeneous Memory Attribute Table (HMAT) support. The default is off. =20 + ``spcr=3Don|off`` + Enables or disables ACPI Serial Port Console Redirection Table + (SPCR) support. The default is on. + ``aux-ram-share=3Don|off`` Allocate auxiliary guest RAM as an anonymous file that is shareable with an external process. This option applies to --=20 2.50.0 From nobody Sat Nov 15 10:42:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1752665349; cv=pass; d=zohomail.com; s=zohoarc; b=YceM2SjKTzgTqCqGzIsGGGRsAPSGPuDYnPTvYdFCHI3Z0+YdSmhWEacF2x4vyxujtdaIby/jkjobT7+KxTbe7nqG+rMUEM2wG6/TH3iBTHQi6Sy2POPtaki6+i+uuThketxfdxwhSnFvIN7PxA+SGBVD9F72W5qSkZwwenNmK4A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752665349; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=zURQNxoyZKdVtB1gy/iQeZPpxTEyEiUmAjpAwlC0X+U=; b=YonnVBJhZyk+EuleKTyfXIAgacKUc4R+SF8KH6yfgP2BC7DKYLDQQOhVKppMt5+xFtstlGkXfShrXN1iYeM/5nOoucGdJv4AH1VWtADbspsK9F03oAYOXaJhiyjhgdrfrgitTyOhSP7vD381wKv8itGpeGE3bV620Sy9rU1/6NE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752665349947655.3991462519618; Wed, 16 Jul 2025 04:29:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uc0IP-0007Mf-OZ; Wed, 16 Jul 2025 07:27:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0CY-0002Xj-Fx; Wed, 16 Jul 2025 07:21:30 -0400 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0CW-00016A-Lz; Wed, 16 Jul 2025 07:21:30 -0400 Received: by mx.zohomail.com with SMTPS id 1752664814920410.61354923073725; Wed, 16 Jul 2025 04:20:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1752664817; cv=none; d=zohomail.com; s=zohoarc; b=iCGFl2rjIOwwbW52CqzeViOMA7g2UEjrXcb/EtaGDFyqGSpygOmmn8FAcbBNM9XMrXnoW/T04hg4BSy/y7r+4UdP+ATqVQKAvJIPCiZMQVqavL2j810dW3Omy9mW0Ew7Ym3m14qKpxQIMXxI0fFp2PA6xe9yP/39ColCVun/9lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752664817; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=zURQNxoyZKdVtB1gy/iQeZPpxTEyEiUmAjpAwlC0X+U=; b=YXRYyQqupz/5LVmn4In2ztqn4N82/luBe2Y4QcNxLVQFjLKolzTx4zFjBJc4UZAgVasCXdBpbNt4Me9UdyNUxOnj3LfDM64zJUI2X6iSH3aIyKswho20J347M+plYGw6Ow3EJbxDGj2ANOO8rEeP8Dgo9HQMZ9SIW5p1ywQHxko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752664817; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=zURQNxoyZKdVtB1gy/iQeZPpxTEyEiUmAjpAwlC0X+U=; b=EOYIJLjV0hS6HImpwochjXKY93HrCDoRcbqi9/iGEwbE71fPRDCOnK7TzDu7LNRe 45DJCRkgmsklYaI7LeGoNFML6v+tQXX7LFeR6vytYwQAgoXAw/S3kD79Z9w7UkbjmdP MBrZZ+/rTVANxtLhAqxAIMZxVsOqKuqAkOs1fNkA= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Subject: [PATCH v5 2/4] tests/qtest/bios-tables-test: Add test for disabling SPCR on AArch64 Date: Wed, 16 Jul 2025 19:19:54 +0800 Message-ID: <20250716111959.404917-3-me@linux.beauty> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250716111959.404917-1-me@linux.beauty> References: <20250716111959.404917-1-me@linux.beauty> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.112; envelope-from=me@linux.beauty; helo=sender4-pp-f112.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1752665351928116600 Content-Type: text/plain; charset="utf-8" From: Li Chen Add ACPI SPCR table test case for ARM when SPCR was off. Signed-off-by: Li Chen --- tests/qtest/bios-tables-test.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 4dbc07ec5e..ede846f905 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1789,6 +1789,24 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) free_test_data(&data); } =20 +static void test_acpi_aarch64_virt_tcg_acpi_spcr(void) +{ + test_data data =3D { + .machine =3D "virt", + .arch =3D "aarch64", + .tcg_only =3D true, + .uefi_fl1 =3D "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-arm-vars.fd", + .cd =3D "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.= qcow2", + .ram_start =3D 0x40000000ULL, + .scan_len =3D 128ULL * 1024 * 1024, + .variant =3D ".acpispcr", + }; + + test_acpi_one("-cpu cortex-a57 " + " -machine spcr=3Doff", &data); + free_test_data(&data); +} static void test_acpi_tcg_acpi_hmat(const char *machine, const char *arch) { test_data data =3D {}; @@ -2604,6 +2622,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb= ); qtest_add_func("acpi/virt/oem-fields", test_acpi_aarch64_virt_oem_fields); + qtest_add_func("acpi/virt/acpispcr", + test_acpi_aarch64_virt_tcg_acpi_spcr); if (qtest_has_device("virtio-iommu-pci")) { qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_vi= ot); } --=20 2.50.0 From nobody Sat Nov 15 10:42:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1752665395; cv=pass; d=zohomail.com; s=zohoarc; b=NoSIAkdQBM4smMZRxyH6M16UF0x5ykPKlUBV77zBSdCT7rElelO7MVHZdmYx0gkj8h/laMqsJe44kjdhSW0Xs7XtJ2RSwGM5u6w0GoQUB8q8rCzQ50BTu6YqrTFeTUQr+Yb29XSO8yawSRe8oDNf2/Kpida0VSvV8Si81GsxzC4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752665395; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hpzfBSOA39ym1MCPK/wVMzJwkjoefykvPuXbZzLpGMc=; b=OyllTXf1V3PoVtTeiIJhjjODPy1ROen+nHXYxJwmts16S2GR1gsRrNzYa0g6x4CJ2/xap/8Bhh6/xmmJbJ+//GHshYQFK1JH+51GIiZFHSPcwcrXEcQh65YQctHZQFk3/q2SZCngiN9AKLxgGQtIX7V/CR3UQaoSFOgDAg9Zxy0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752665395246490.79218231525715; Wed, 16 Jul 2025 04:29:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uc0KQ-0001nZ-Nw; Wed, 16 Jul 2025 07:29:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0Cy-00034A-BV; Wed, 16 Jul 2025 07:21:56 -0400 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0Cw-0001An-BD; Wed, 16 Jul 2025 07:21:56 -0400 Received: by mx.zohomail.com with SMTPS id 1752664819828742.8670461414554; Wed, 16 Jul 2025 04:20:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1752664821; cv=none; d=zohomail.com; s=zohoarc; b=gyoebC35v+ys6LSvZo11XETOECJweIaILQ4LVYcLReqxOyYx0PHBPHxyqFGplMdOpEIcqwruk0Xo8rl1jt1/2BFt9q3KCV/984xNAL2NBkDR9vEQ5HjZf5bP6NkMbboA822ZXnecmOHnpaSOKDU31wtr1srnW9C2YZoC59kReXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752664821; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hpzfBSOA39ym1MCPK/wVMzJwkjoefykvPuXbZzLpGMc=; b=jH81O11gzUcI4CMdXuwOGqdar0jQUQWpWB0o+zPNj18HPJSEQPhQVsAIv6VIHc/YEeO72YxE4efjwV/AG9dvRtOxlGiFhsy5+q5gEEL+TSkqTEDP7hSsX79it6kBeG3xtZFNIj/eD3K52bdysMOQ0lI/+RMTIRGf83XzpS+9fic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752664821; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=hpzfBSOA39ym1MCPK/wVMzJwkjoefykvPuXbZzLpGMc=; b=JZTJSaY2zRbDXMaHZmOkaGL9nZdaNWeb/iSB7XKHJg8FaB8Mk4gwmQJeqkMMWFjx 2mmLVJpaA9nsCkk/QKdE/Fbr9kxsxcbekMxbkofUBPcXUNRUWFUOzH2Wo3dCGuFMjQ8 Jmd5UWBdzaHKOSwCk58z6b1ywDvic/RLBTM+AhBk= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Subject: [PATCH v5 3/4] tests/qtest/bios-tables-test: Add test for disabling SPCR on RISC-V Date: Wed, 16 Jul 2025 19:19:55 +0800 Message-ID: <20250716111959.404917-4-me@linux.beauty> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250716111959.404917-1-me@linux.beauty> References: <20250716111959.404917-1-me@linux.beauty> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.112; envelope-from=me@linux.beauty; helo=sender4-pp-f112.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1752665395763116600 Content-Type: text/plain; charset="utf-8" From: Li Chen Add ACPI SPCR table test case for RISC-V when SPCR was off. Signed-off-by: Li Chen Reviewed-by: Sunil V L --- Notes: Changes since v3: Add Reviewed-by from Sunil V L tests/qtest/bios-tables-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index ede846f905..04a9d8a4da 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1807,6 +1807,26 @@ static void test_acpi_aarch64_virt_tcg_acpi_spcr(voi= d) " -machine spcr=3Doff", &data); free_test_data(&data); } + +static void test_acpi_riscv_virt_tcg_acpi_spcr(void) +{ + test_data data =3D { + .machine =3D "virt", + .arch =3D "riscv64", + .tcg_only =3D true, + .uefi_fl1 =3D "pc-bios/edk2-riscv-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-riscv-vars.fd", + .cd =3D "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.= qcow2", + .ram_start =3D 0x80000000ULL, + .scan_len =3D 128ULL * 1024 * 1024, + .variant =3D ".acpispcr", + }; + + test_acpi_one("-cpu rva22s64 " + "-machine spcr=3Doff", &data); + free_test_data(&data); +} + static void test_acpi_tcg_acpi_hmat(const char *machine, const char *arch) { test_data data =3D {}; @@ -2633,6 +2653,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_riscv64_virt_tcg_numamem); + qtest_add_func("acpi/virt/acpispcr", + test_acpi_riscv_virt_tcg_acpi_spcr); } } ret =3D g_test_run(); --=20 2.50.0 From nobody Sat Nov 15 10:42:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1752665519; cv=pass; d=zohomail.com; s=zohoarc; b=Gwz42WhF4Xmd1+M2SNwJTf923CE8YWzZJAJD/RmeXJe/uVNVqduEWTBvn5BUaHPXlXgtwDc7SupcFeVfP7A595fPHd6p8CkBiRIqTfCzs35UcGj4mrT5JeX/bDTe4Nyi3YhNGp++mhKWR4SH06FkZKnBv5KwmD9H9xJSRmpqFNo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752665519; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=/QpS4sUrmm/ishoPatrTc/F0h2NQwScMA4kFCFRLbBE=; b=diPg8FLWaA1uNLMwLxs+ZUuRmfWnerTlM5EqVrXlgT1JDRqADl+ahCXxPNcongs5eup1YDBhGEYibzE61EyHJIoUOpzfzX9CrlZTqOLceBSJN5HPhBO50KMxMTdvv0s401OyGV4Ca9hW4dEoVW4PkQHt/npCOsOTBWKFCB3SMZU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752665519634518.3739808105229; Wed, 16 Jul 2025 04:31:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uc0M7-00045K-AB; Wed, 16 Jul 2025 07:31:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0DK-0003fQ-6o; Wed, 16 Jul 2025 07:22:18 -0400 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uc0DI-0001Dy-17; Wed, 16 Jul 2025 07:22:17 -0400 Received: by mx.zohomail.com with SMTPS id 1752664824422729.9651341987811; Wed, 16 Jul 2025 04:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1752664825; cv=none; d=zohomail.com; s=zohoarc; b=DHvnyi8O3qAqL1gY3vQYXwq/KBOXnOKpUrnLo7VwyGSQ++gI3ZqjwYCdBEUz7RPBnKRSc8f/YtQ6Npsc6yN9/UiojJ2D1cTd8QDdJSV+hshPAOfQIg5bgqVGxSDnL+TyAuBJPEo2PFf/ijIUrQPLpSVfuoHaSW7Y4h1jlRjeOKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752664825; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=/QpS4sUrmm/ishoPatrTc/F0h2NQwScMA4kFCFRLbBE=; b=DxlPGuLGyJ2figQoKAZKpsXXK/pMCUsWG1oIdIEyyYErQmmYf3t2lUZwH5yvufRk8T09SCaJpd2ivpjMb2U8odcDmYj629O3Y5xEqoWXKhvZ7iPSjG+kG2egXO04ZC5c4w7piazQoIJcA4vIRLhsNqivGf4FpLFfBXoUYJJT7d0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752664825; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=/QpS4sUrmm/ishoPatrTc/F0h2NQwScMA4kFCFRLbBE=; b=OE1MAE4R+/mpBXbNfvW32vWj1AvnAZiWC5oJR06+4KaNI+QpjN+4LQutANXCo77a 9yLVZ6rnTAkA7sYWS6KvUD+LFYmYqwFztTPK8dTc3YlBUWfq8joMrj0SelijK+Y82Da WcgXnXLR5ifJy/fchdGvNY5y0GgWc1jviD3hpa8w= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Subject: [PATCH v5 4/4] acpi/virt: suppress UART device & SPCR when guest has no serial hardware Date: Wed, 16 Jul 2025 19:19:56 +0800 Message-ID: <20250716111959.404917-5-me@linux.beauty> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250716111959.404917-1-me@linux.beauty> References: <20250716111959.404917-1-me@linux.beauty> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.112; envelope-from=me@linux.beauty; helo=sender4-pp-f112.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1752665521763116600 From: Li Chen The virt machines always instantiate a PL011/16550 at UART0 and describe it in ACPI (DSDT device node plus optional SPCR table). When the command line contains =E2=80=9C-serial none=E2=80=9D there is no backen= d attached to that UART, yet the guest still discovers it via ACPI and may try to use it as a console, causing unexpected results. And also explicitly add "-serial stdio" in bios-tables-test.c to allow serial device creation, otherwise DSDT assert would get failure because "-nodefaults" will not create uart device by default: ``` stderr: acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-BMOL72]= , Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. See source file tests/qtest/bios-tables-test.c for instructions on how to u= pdate expected files. acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-RNOL72.dsl, aml:/tm= p/aml-BMOL72], Expected [asl:/tmp/asl-ZVQL72.dsl, aml:tests/data/acpi/aarch= 64/virt/DS DT]. ``` Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Li Chen Reviewed-by: Sunil V L --- Notes: Changes since v4: 1. Also suppress UART device & SPCR when guest has no= serial hardware on loongarch 2. rename serial_exist to serial_exists 3. fix style issue Changes since v3: 1. Add Reviewed-by from Sunil V L 2. Explicitly add "-serial stdio" to pass DSDT assert hw/arm/virt-acpi-build.c | 15 +++++++++------ hw/loongarch/virt-acpi-build.c | 8 +++++--- hw/riscv/virt-acpi-build.c | 8 ++++++-- include/system/system.h | 2 ++ system/vl.c | 5 +++++ tests/qtest/bios-tables-test.c | 5 +++-- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 782b17b966..8761e814ec 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -61,6 +61,7 @@ #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" #include "target/arm/multiprocessing.h" +#include "system/system.h" =20 #define ARM_SPI_BASE 32 =20 @@ -908,11 +909,13 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Vi= rtMachineState *vms) */ scope =3D aml_scope("\\_SB"); acpi_dsdt_add_cpus(scope, vms); - acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], - (irqmap[VIRT_UART0] + ARM_SPI_BASE), 0); - if (vms->second_ns_uart_present) { - acpi_dsdt_add_uart(scope, &memmap[VIRT_UART1], - (irqmap[VIRT_UART1] + ARM_SPI_BASE), 1); + if (serial_exists()) { + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], + (irqmap[VIRT_UART0] + ARM_SPI_BASE), 0); + if (vms->second_ns_uart_present) { + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART1], + (irqmap[VIRT_UART1] + ARM_SPI_BASE), 1); + } } if (vmc->acpi_expose_flash) { acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); @@ -1024,7 +1027,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuild= Tables *tables) =20 acpi_add_table(table_offsets, tables_blob); =20 - if (ms->acpi_spcr_enabled) { + if (ms->acpi_spcr_enabled && serial_exists()) { spcr_setup(tables_blob, tables->linker, vms); } =20 diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c index 8c2228a772..d356578968 100644 --- a/hw/loongarch/virt-acpi-build.c +++ b/hw/loongarch/virt-acpi-build.c @@ -485,8 +485,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Mac= hineState *machine) =20 acpi_table_begin(&table, table_data); dsdt =3D init_aml_allocator(); - for (i =3D 0; i < VIRT_UART_COUNT; i++) { - build_uart_device_aml(dsdt, i); + if (serial_exists()) { + for (i =3D 0; i < VIRT_UART_COUNT; i++) { + build_uart_device_aml(dsdt, i); + } } build_pci_device_aml(dsdt, lvms); build_la_ged_aml(dsdt, machine); @@ -558,7 +560,7 @@ static void acpi_build(AcpiBuildTables *tables, Machine= State *machine) build_srat(tables_blob, tables->linker, machine); acpi_add_table(table_offsets, tables_blob); =20 - if (machine->acpi_spcr_enabled) + if (machine->acpi_spcr_enabled && serial_exists()) spcr_setup(tables_blob, tables->linker, machine); =20 if (machine->numa_state->num_nodes) { diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index ee1416d264..5132aa7b55 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -39,6 +39,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "system/reset.h" +#include "system/system.h" =20 #define ACPI_BUILD_TABLE_SIZE 0x20000 #define ACPI_BUILD_INTC_ID(socket, index) ((socket << 24) | (index)) @@ -474,7 +475,10 @@ static void build_dsdt(GArray *table_data, memmap[VIRT_APLIC_S].size, "RSCV0002"); } =20 - acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); + if (serial_exists()) { + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); + } + if (virt_is_iommu_sys_enabled(s)) { acpi_dsdt_add_iommu_sys(scope, &memmap[VIRT_IOMMU_SYS], IOMMU_SYS_= IRQ); } @@ -895,7 +899,7 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuil= dTables *tables) =20 acpi_add_table(table_offsets, tables_blob); =20 - if (ms->acpi_spcr_enabled) { + if (ms->acpi_spcr_enabled && serial_exists()) { spcr_setup(tables_blob, tables->linker, s); } =20 diff --git a/include/system/system.h b/include/system/system.h index a7effe7dfd..022222c81a 100644 --- a/include/system/system.h +++ b/include/system/system.h @@ -75,6 +75,8 @@ extern unsigned int nb_prom_envs; /* Return the Chardev for serial port i, or NULL if none */ Chardev *serial_hd(int i); =20 +bool serial_exists(void); + /* parallel ports */ =20 #define MAX_PARALLEL_PORTS 3 diff --git a/system/vl.c b/system/vl.c index 3b7057e6c6..2ec18d4a59 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1482,6 +1482,11 @@ Chardev *serial_hd(int i) return NULL; } =20 +bool serial_exists(void) +{ + return serial_hd(0) ? true : false; +} + static bool parallel_parse(const char *devname, Error **errp) { static int index =3D 0; diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 04a9d8a4da..802ad5ccfd 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -824,10 +824,11 @@ static char *test_acpi_create_args(test_data *data, c= onst char *params) /* * TODO: convert '-drive if=3Dpflash' to new syntax (see e33763be7= cd3) * when arm/virt boad starts to support it. + * NOTE: Explicitly add "-serial stdio" to enable uart in DSDT. */ if (data->cd) { args =3D g_strdup_printf("-machine %s%s %s -accel tcg " - "-nodefaults -nographic " + "-nodefaults -serial stdio -nographic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don -= cdrom %s %s", data->machine, data->machine_param ?: "", @@ -835,7 +836,7 @@ static char *test_acpi_create_args(test_data *data, con= st char *params) data->uefi_fl1, data->uefi_fl2, data->cd, params ? params = : ""); } else { args =3D g_strdup_printf("-machine %s%s %s -accel tcg " - "-nodefaults -nographic " + "-nodefaults -serial stdio -nographic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don %= s", data->machine, data->machine_param ?: "", --=20 2.50.0