From nobody Sun Feb 8 11:33:21 2026 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=1747312938; cv=pass; d=zohomail.com; s=zohoarc; b=WFFFQP0is+fssO2Bi2A80YbnlGbi+vbplcI6dtuyhkwdTwnvX2flIG/l7rFwuz4TOQt/z46Ab0M+pkCuUMRkYuIkBSMefoNXMZcxm0UMkuyJBNgTmw2Rff26JjcTANUMR/KX1M2NS0UA6u3UGWYNA2WRXXocYQoWo7NfXsfWNXc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747312938; h=Content-Type: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=sOoa7OazfG9PBNcg4uZXxjwpzZMA8hhvpy2CeeEbcoo=; b=d92cs9n3gr4OyFn1xnML1hct+6wC1WSQDgBMo+6vYJ0dwS8Wt4KTMU4PZDwKxvpZQTCgwAV4k7dpvAyrHq7oJNA8QB80GhehCAdT6WCSCyFcazsaWn94DaTptdJT73F9hIyO9aWL/0taNe1+3mNN1GcoLRyisrtv7Qq0BU/yd9U= 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 17473129381561011.6346150136973; Thu, 15 May 2025 05:42:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFXuU-0002iC-FD; Thu, 15 May 2025 08:42:02 -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 1uFXuH-0002Mv-7H; Thu, 15 May 2025 08:41:49 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFXuF-0007dz-3o; Thu, 15 May 2025 08:41:48 -0400 Received: by mx.zohomail.com with SMTPS id 1747312868309660.3907576829178; Thu, 15 May 2025 05:41:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747312870; cv=none; d=zohomail.com; s=zohoarc; b=lXKazK33GIGXnAh4qcXAAOgVa2y7N8MRhVEroh39T4RhKCVSUd2rft64OWjSX5J4RI81esF+UAJAvCwx9sOa9qA/hW1gHEYCXT7VUEosrPmL0KRKvVxugXyZb6qxOzO9cvASd6ZPqhDdTo/HzGpZ9dxukNMRiVmE14qLqBiom7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747312870; h=Content-Type:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=sOoa7OazfG9PBNcg4uZXxjwpzZMA8hhvpy2CeeEbcoo=; b=EKSqX9eM/5nkSS/Y2CczNHWQEgVYNjqvyZygn+WREWKU/TvYep7xgNVOjt/Pi8IcAe8nklqKC6eYnAGfMxcdcaX18lze/67X5ONzTcrC79AFdu+Rc3526eiE+mRvZ2VlRk+6dRwdowPWnumtEwgo4g6y7HupeMp9hBwQb7qquok= 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=1747312870; s=zmail; d=linux.beauty; i=me@linux.beauty; h=Date:Date:Message-ID:From:From:To:To:Subject:Subject:In-Reply-To:References:MIME-Version:Content-Type:Message-Id:Reply-To:Cc; bh=sOoa7OazfG9PBNcg4uZXxjwpzZMA8hhvpy2CeeEbcoo=; b=FgL8bvG+7c7151dVUic9YBN5jWbU9PafdkDYyxVR4CvohRVGpjBADjTt4MRc4h5O mEnwQv1zxdKX7oyN5riv+fx7PsmShGVRVDGWVoOqRB6Ov/i2prlo8v+zO5rq1ufC0HC pAr01KQR5QamsztbcDjjr2a3OFHGHbxBPGal/lZM= Date: Thu, 15 May 2025 20:41:03 +0800 Message-ID: <87ldqyrqqo.wl-me@linux.beauty> From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?ISO-8859-1?Q?=22Philippe_Mathieu-Daud=E9?= =?ISO-8859-1?Q?=22?= , "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 V3 1/4] acpi: Add machine option to disable SPCR table In-Reply-To: <87msberqzi.wl-me@linux.beauty> References: <87msberqzi.wl-me@linux.beauty> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") 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.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1747312940167116600 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 3ac8f8e178..f25c3b26ce 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -940,7 +940,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildT= ables *tables) } acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, vms); + + if (ms->enable_spcr) { + spcr_setup(tables_blob, tables->linker, vms); + } 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 ed01798d37..71a935512e 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -593,6 +593,20 @@ static void machine_set_nvdimm(Object *obj, bool value= , Error **errp) ms->nvdimms_state->is_enabled =3D value; } +static bool machine_get_spcr(Object *obj, Error **errp) +{ + MachineState *ms =3D MACHINE(obj); + + return ms->enable_spcr; +} + +static void machine_set_spcr(Object *obj, bool value, Error **errp) +{ + MachineState *ms =3D MACHINE(obj); + + ms->enable_spcr =3D value; +} + static bool machine_get_hmat(Object *obj, Error **errp) { MachineState *ms =3D MACHINE(obj); @@ -1297,6 +1311,14 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } + /* SPCR */ + ms->enable_spcr =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 fced6c445a..0e437bcf25 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->enable_spcr) + spcr_setup(tables_blob, tables->linker, machine); 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 1ad6800508..7f6d221c63 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -680,7 +680,10 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBui= ldTables *tables) build_rhct(tables_blob, tables->linker, s); acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, s); + + if (ms->enable_spcr) { + spcr_setup(tables_blob, tables->linker, s); + } acpi_add_table(table_offsets, tables_blob); { diff --git a/include/hw/boards.h b/include/hw/boards.h index 765dc8dd35..089104d54b 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -444,6 +444,7 @@ struct MachineState { SmpCache smp_cache; struct NVDIMMState *nvdimms_state; struct NumaState *numa_state; + bool enable_spcr; }; /* diff --git a/qemu-options.hx b/qemu-options.hx index dc694a99a3..953680595f 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. + ``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 -- 2.49.0 From nobody Sun Feb 8 11:33:21 2026 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=1747312997; cv=pass; d=zohomail.com; s=zohoarc; b=RdA+rFmX3PBnu8Eo2djnOcYqLEvdeBfGhHCteP24XAZcchwGhOaI4bT67EfW09fu9i4Aes7Rg105E88uHPn3Wt+e7LBnVkRApDWzan3BJyRP9dCgZUTzx/05qPPELiWInLQ4P2gUzO8dw3YoEF51ZwjJrn3j1L9eCb1zRpMajJI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747312997; h=Content-Type: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=2c0O9T1s6X8/ZTemOXWayC8UqGgBEItGWgmlUlE7g6Y=; b=OzttSP/iSjS17s/cdsCi7jrIGJsh2/54XiZJC9ro+lSHB5ITdW12rynXlj3I5P7QfyUq0jErrvi3W+RUiBzc6pdHkAteYZRctQ+kd6St3/+2/05uv6s0YzZ0hK/re9k9LuPh8KalHwxuZqonebyPylw1YI72gp+GyM2g11CEqdk= 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 1747312997747533.3785970215112; Thu, 15 May 2025 05:43:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFXvQ-0004CT-JU; Thu, 15 May 2025 08:43:00 -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 1uFXvD-0003tP-9X; Thu, 15 May 2025 08:42:51 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFXv9-0007h9-Pt; Thu, 15 May 2025 08:42:46 -0400 Received: by mx.zohomail.com with SMTPS id 1747312933525403.31887335201293; Thu, 15 May 2025 05:42:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747312935; cv=none; d=zohomail.com; s=zohoarc; b=U1tTreCxkfjgoyVIdZ5gMu7skN+jP/yJmGEkQUPqem/rs619Km017HxeaCGcQH4Ob6inDsi4cWZPEOO3TSgcc2xctJBldPwfKlAJvqmYHgjpPTEfyo9DZnIKLfDoLdRdMhUJHZpvU3Yex5TuSSioMaNOoDC/GFdra+eJsoVNrfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747312935; h=Content-Type:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=2c0O9T1s6X8/ZTemOXWayC8UqGgBEItGWgmlUlE7g6Y=; b=hZUHkN2+wb6yZB8NUOiK/ufv3WWDEy7OCQ/MmjKT718DKLunj3++XhP+P4/fb0+p4FIIRyEDHAmWBPMXVglMv1MmJ9Bbw914y5LXvfWJLY62Vxng4xAS1+hFFURhwP+VuShtqHh+TsqNTGqE+cLtr+0aPZBSj//BP6z+24JTzFU= 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=1747312934; s=zmail; d=linux.beauty; i=me@linux.beauty; h=Date:Date:Message-ID:From:From:To:To:Subject:Subject:In-Reply-To:References:MIME-Version:Content-Type:Message-Id:Reply-To:Cc; bh=2c0O9T1s6X8/ZTemOXWayC8UqGgBEItGWgmlUlE7g6Y=; b=atCqdIUXWGgL46/OwbUEYLkNvqeZMcvzLScQVPkOTJaRFGL9e39HN4e6nnFKMxXY PnYXiwyVnfvIlZQj5M312d/5E3PAR1vDUM8atAGOCsyTbgarvvgbu1skI4HY81TEgP4 mdVxa+KYSl45rnoiLszUl0LbBIX9ROb2/xM7H7mw= Date: Thu, 15 May 2025 20:42:07 +0800 Message-ID: <87jz6irqow.wl-me@linux.beauty> From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?ISO-8859-1?Q?=22Philippe_Mathieu-Daud=E9?= =?ISO-8859-1?Q?=22?= , "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 V3 2/4] tests/qtest/bios-tables-test: Add test for disabling SPCR on AArch64 In-Reply-To: <87msberqzi.wl-me@linux.beauty> References: <87msberqzi.wl-me@linux.beauty> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") 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.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1747312999014116600 Content-Transfer-Encoding: quoted-printable 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 0a333ec435..d2a1aa7fb3 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 {}; @@ -2583,6 +2601,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.49.0 From nobody Sun Feb 8 11:33:21 2026 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=1747313046; cv=pass; d=zohomail.com; s=zohoarc; b=N4W8k7iepmOfYv4bqcZAIQTaJmDIY+hZR65X/FFWkRFHQZo2jhWNAb8jQq5sLRAAddLKm66bwFdsP65tIqdc7DNH21h2PJIvMBcR+D5cZx/9WsQ+HM8b43sI735MHjBpt2hHC8ofhPl0Hce1UcZWTa12ta9I8CAArCVpcS7Y3Gk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747313046; h=Content-Type: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=/stvQ7CKfZG2qrLmD8V83vEdkR/vmhNKv8wtTQoJZjI=; b=KSTLP5qraKqMpCBnuosIRRUIIt9t1abZUoGIoEzHoXzu1sYoJAk8Ey/UX02JnhVW0wcrEJNx97vmOQxBRwU//oCLlrHzhE9QN5OHm7E8xerwmF1oQdYixXg3hnqxuDeZD0F45zOQS4p3j5FhEU/ox/7LNV921jaDKwSftEsR3SQ= 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 1747313046326588.0152635175847; Thu, 15 May 2025 05:44:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFXwQ-0005BO-7i; Thu, 15 May 2025 08:44:02 -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 1uFXwH-0004xe-Ec; Thu, 15 May 2025 08:43:56 -0400 Received: from sender3-op-o15.zoho.com ([136.143.184.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFXwE-0007kp-Ji; Thu, 15 May 2025 08:43:52 -0400 Received: by mx.zohomail.com with SMTPS id 1747312993212148.3516867271594; Thu, 15 May 2025 05:43:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747312995; cv=none; d=zohomail.com; s=zohoarc; b=QvC8qCi7ldfxJsqEMvs7vmTY+6y9zUqKSn5CAOdPg8OjYBgGtmg14CqUM7lXk35xbxUu5kusPzkWyyhQnRrHCDM9TI6M0ZzEqYxj8OrZo3Fsahimk8H2yXIB/E11aqt0oYib7nWvi8lz0WeNwFpS51l4MEDwC1qFQ3WOF2rMVEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747312995; h=Content-Type:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=/stvQ7CKfZG2qrLmD8V83vEdkR/vmhNKv8wtTQoJZjI=; b=Fflgg5gm6BweCaA0JbiGxOGmdiNdraJS37Q8yLdBXhI2NfCR3xs3IbyT6GFdd+sdT+YbIcbQp35s8E1ZMKGWj+GuBTZ37+ZTssrYURoZHUgjIMrJ2jKLJqtwGNXdLTLxpIcNwvPdd4Co6YAJIic83NoemJ9CYz0hx1JBI3vz/ds= 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=1747312995; s=zmail; d=linux.beauty; i=me@linux.beauty; h=Date:Date:Message-ID:From:From:To:To:Subject:Subject:In-Reply-To:References:MIME-Version:Content-Type:Message-Id:Reply-To:Cc; bh=/stvQ7CKfZG2qrLmD8V83vEdkR/vmhNKv8wtTQoJZjI=; b=l97EEIr6wqUclFNMFEyQLrd+k02jzscCjPaIn3ktf8Kn8NIM6L+2BIfVnNTFHYAh mDKeKAJZNjHTEw/o2IqCajKX93GDsC9l+JE0g7QM+Ud47eyU4FmlzrgbT4bGMR+Bv1D 8ZRVn63qq2UzZVt0199VXqFnCcGzWX0Y8ELpEFno= Date: Thu, 15 May 2025 20:43:07 +0800 Message-ID: <87ikm2rqn8.wl-me@linux.beauty> From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?ISO-8859-1?Q?=22Philippe_Mathieu-Daud=E9?= =?ISO-8859-1?Q?=22?= , "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 V3 3/4] tests/qtest/bios-tables-test: Add test for disabling SPCR on RISC-V In-Reply-To: <87msberqzi.wl-me@linux.beauty> References: <87msberqzi.wl-me@linux.beauty> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") 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.184.15; envelope-from=me@linux.beauty; helo=sender3-op-o15.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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1747313047322116600 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Li Chen =20 Add ACPI SPCR table test case for RISC-V when SPCR was off. Signed-off-by: Li Chen Reviewed-by: 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 d2a1aa7fb3..44de152a36 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 {}; @@ -2612,6 +2632,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.49.0 From nobody Sun Feb 8 11:33:21 2026 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=1747313298; cv=pass; d=zohomail.com; s=zohoarc; b=BmsPJgMqR4CHmmPIpLwh3TXTwa6Y2e0zi9LcEWyUgSfqPERuuRmAg05iB8GPdJLVzNCzZ0TP2I9ranq/wSrbOzwamGu8BOsGa1W7uQHxPKvQRi0guRmLFr2lN+EA63h4zw/kXBiGu07DcBIfVULAfpYFMAJrkpL5TIn9diP38bo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747313298; 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=5oBCKR+BEOAMgT5mi2qQxrVeejcz+Hgy2JB8xmosz08=; b=a2Pf7DXAUuKyOhvPGt14V1IcAmREr4DtWCILrlCRHiF6DqJIpwSr1MbCvV455JU/wWU82JWiwyIN+K2c7IODJZ/QNsx1b5+FVBd1q9MnCMRudm9g+muCbe5RN8b8EaMhpGklffAR+54QcHxtmjo9FJeVIINolaBTj7t/BSzt3vk= 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 1747313298417506.81895055975735; Thu, 15 May 2025 05:48:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFY0D-0006Xw-J5; Thu, 15 May 2025 08:47:57 -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 1uFXza-0006PC-UK; Thu, 15 May 2025 08:47:23 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFXzY-0008Ap-PQ; Thu, 15 May 2025 08:47:18 -0400 Received: by mx.zohomail.com with SMTPS id 1747313085797628.779226728745; Thu, 15 May 2025 05:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747313088; cv=none; d=zohomail.com; s=zohoarc; b=lMgOIJTOSkogASr29Cz8ZYm/r0VPhQ10nxaEQS1xJllUJuU57PHR+HjffClRtoh4Sof51Em2cCOQ+OnSJpTmBbm4bl8U6375GqerCos8WgBtcM6feK6E7fZLvuHHq8gbmJFnbMU8cpIjKQij1ErxSE1sM964mqmayS5UFDDCuZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747313088; 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=5oBCKR+BEOAMgT5mi2qQxrVeejcz+Hgy2JB8xmosz08=; b=X7Z3jt5XftNaEADO5s73Q9r/d0+sVWZ9K+dhVhUe9fulAczJNkkkrSFUFBszcpVvzkhGU56yY0vPPfgkvZIidYpGhuoBWu4jZwIJCV+f1builUa2fWUTKu1PzH72j7FSyHvfgmY5cFQiXSXyaPC1hYeVWSKxT3VAoI7x1se3ayA= 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=1747313088; s=zmail; d=linux.beauty; i=me@linux.beauty; h=Date:Date:Message-ID:From:From:To:To:Subject:Subject:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=5oBCKR+BEOAMgT5mi2qQxrVeejcz+Hgy2JB8xmosz08=; b=bRugOOJSjuvK8vNQ3xH2/07uoHPpbkZ25vwowS++2RBxVAd86hwWZjt8jansQrvE HjBivpgEXuZTOBjGSY0z7ZHNevOXjG51Jd3BOyhG84doBjCsThMv702kf6AQ3PcIMj8 W5F7p3XG4Px/J3IEfOkXq17sa7hmaJx9/2TmtGUo= Date: Thu, 15 May 2025 20:44:39 +0800 Message-ID: <87h61mrqko.wl-me@linux.beauty> From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?ISO-8859-1?Q?=22Philippe_Mathieu-Daud=E9?= =?ISO-8859-1?Q?=22?= , "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 V3 4/4] acpi/virt: suppress UART device & SPCR when guest has no serial hardware In-Reply-To: <87msberqzi.wl-me@linux.beauty> References: <87msberqzi.wl-me@linux.beauty> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") 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.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1747313299890116600 Content-Type: text/plain; charset="utf-8" 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. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Li Chen Reviewed-by: Sunil V L --- hw/arm/virt-acpi-build.c | 15 +++++++++------ hw/riscv/virt-acpi-build.c | 6 ++++-- include/system/system.h | 2 ++ system/vl.c | 5 +++++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index f25c3b26ce..8a1cde4b44 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -59,6 +59,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 @@ -825,11 +826,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_exist()) { + 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]); @@ -941,7 +944,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) =20 acpi_add_table(table_offsets, tables_blob); =20 - if (ms->enable_spcr) { + if (ms->enable_spcr && serial_exist()) { spcr_setup(tables_blob, tables->linker, vms); } =20 diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 7f6d221c63..4e0f695a16 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)) @@ -449,7 +450,8 @@ 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_exist()) + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); =20 if (socket_count =3D=3D 1) { virtio_acpi_dsdt_add(scope, memmap[VIRT_VIRTIO].base, @@ -681,7 +683,7 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuil= dTables *tables) =20 acpi_add_table(table_offsets, tables_blob); =20 - if (ms->enable_spcr) { + if (ms->enable_spcr && serial_exist()) { spcr_setup(tables_blob, tables->linker, s); } =20 diff --git a/include/system/system.h b/include/system/system.h index a7effe7dfd..ca1af38432 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_exist(void); + /* parallel ports */ =20 #define MAX_PARALLEL_PORTS 3 diff --git a/system/vl.c b/system/vl.c index 520956f4a1..7e219df7bf 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1484,6 +1484,11 @@ Chardev *serial_hd(int i) return NULL; } =20 +bool serial_exist(void) +{ + return serial_hd(0) ? true : false; +} + static bool parallel_parse(const char *devname, Error **errp) { static int index =3D 0; --=20 2.49.0