acpi: Add machine option to disable SPCR table
Hi,
Quoted 9 lines · Li Chen
From: Li Chen <[email protected]>
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=ttyAMA0"), the kernel still register the serial device referenced by SPCR as a printk console.
Quoted 7 lines
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=off
Please add some tests in tests/qtest/bios-tables-test.c.
Quoted 15 lines
By default, the option is enabled (spcr=on), 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 <[email protected]>--- 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(-)
Quoted 15 lines · Li Chen
From: Li Chen <[email protected]>
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=ttyAMA0"), 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:
Quoted 8 lines
-machine spcr=off
By default, the option is enabled (spcr=on), 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 <[email protected]>
The patches look ok to me
Quoted 133 lines
--- 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(-)hw/arm/virt-acpi-build.c +4
-1@@ -940,7 +940,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *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);hw/core/machine.c +22
-0@@ -590,6 +590,20 @@ static void machine_set_nvdimm(Object *obj, bool value, Error **errp) ms->nvdimms_state->is_enabled = value; } +static bool machine_get_spcr (Object *obj,Error **errp) +{ +MachineState *ms =MACHINE (obj); + +return ms->enable_spcr; +} + +static void machine_set_spcr (Object *obj,bool value,Error **errp) +{ +MachineState *ms =MACHINE (obj); + + ms->enable_spcr = value; +} +static bool machine_get_hmat (Object *obj,Error **errp) {MachineState *ms =MACHINE (obj);@@ -1294,6 +1308,14 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } +/* SPCR */ + ms->enable_spcr = true; +object_property_add_bool (obj,"spcr" , machine_get_spcr, machine_set_spcr); +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 = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus;hw/loongarch/virt-acpi-build.c +3
-1@@ -557,7 +557,9 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *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) {hw/riscv/virt-acpi-build.c +4
-1@@ -680,7 +680,10 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *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); {include/hw/boards.h +1
-0@@ -444,6 +444,7 @@ struct MachineState {SmpCache smp_cache;struct NVDIMMState *nvdimms_state;struct NumaState *numa_state; +bool enable_spcr; };/* qemu-options.hx +5
-0@@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " nvdimm=on|off controls NVDIMM support (default=off)\n" " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" + " spcr=on|off controls ACPI SPCR support (default=on)\n" #ifdef CONFIG_POSIX " aux-ram-share=on|off allocate auxiliary guest RAM as 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=on|off`` + Enables or disables ACPI Serial Port Console Redirection Table + (SPCR) support. The default is on. + ``aux-ram-share=on|off`` Allocate auxiliary guest RAM as an anonymous file that is shareable with an external process. This option applies toSignature · 1 line
2.49.0
Quoted 145 lines · Li Chen
From: Li Chen <[email protected]>
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=ttyAMA0"), 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=off
By default, the option is enabled (spcr=on), 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 <[email protected]>--- 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(-)hw/arm/virt-acpi-build.c +4
-1@@ -940,7 +940,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *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);hw/core/machine.c +22
-0@@ -590,6 +590,20 @@ static void machine_set_nvdimm(Object *obj, bool value, Error **errp) ms->nvdimms_state->is_enabled = value; } +static bool machine_get_spcr (Object *obj,Error **errp) +{ +MachineState *ms =MACHINE (obj); + +return ms->enable_spcr; +} + +static void machine_set_spcr (Object *obj,bool value,Error **errp) +{ +MachineState *ms =MACHINE (obj); + + ms->enable_spcr = value; +} +static bool machine_get_hmat (Object *obj,Error **errp) {MachineState *ms =MACHINE (obj);@@ -1294,6 +1308,14 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } +/* SPCR */ + ms->enable_spcr = true; +object_property_add_bool (obj,"spcr" , machine_get_spcr, machine_set_spcr); +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 = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus;hw/loongarch/virt-acpi-build.c +3
-1@@ -557,7 +557,9 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *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) {hw/riscv/virt-acpi-build.c +4
-1@@ -680,7 +680,10 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *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); {include/hw/boards.h +1
-0@@ -444,6 +444,7 @@ struct MachineState {SmpCache smp_cache;struct NVDIMMState *nvdimms_state;struct NumaState *numa_state; +bool enable_spcr; };/* qemu-options.hx +1
-0@@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " nvdimm=on|off controls NVDIMM support (default=off)\n" " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" + " spcr=on|off controls ACPI SPCR support (default=on)\n" #ifdef CONFIG_POSIX " aux-ram-share=on|off allocate auxiliary guest RAM as shared (default: off)\n" #endif
qemu-options.hx SRST · line 115
Quoted 10 lines
qemu-options.hx +4
-0@@ -105,6 +106,10 @@ SRST Enables or disables ACPI Heterogeneous Memory Attribute Table (HMAT) support. The default is off. + ``spcr=on|off`` + Enables or disables ACPI Serial Port Console Redirection Table + (SPCR) support. The default is on. + ``aux-ram-share=on|off`` Allocate auxiliary guest RAM as an anonymous file that is shareable with an external process. This option applies to
Hi Philippe,
Thanks for your review!
---- On Tue, 22 Apr 2025 16:00:19 +0800 Philippe Mathieu-Daudé <[email protected]> wrote ---
Quoted 18 lines
Hi,
Quoted 15 lines · Li Chen
From: Li Chen <[email protected]>
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=ttyAMA0"), 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:
Quoted 3 lines
Quoted 1 line
-machine spcr=off
Please add some tests in
tests/qtest/bios-tables-test.c.
I'll add test machines for all affected architectures in v2. Thanks again.
Regards,
Li
PATCH 1/1 acpi: Add machine option to disable SPCR table
From: Li Chen <[email protected]>
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=ttyAMA0"), 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=off
By default, the option is enabled (spcr=on), 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.
--- 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(-)
hw/arm/virt-acpi-build.c +4 -1
@@ -940,7 +940,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *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);
hw/core/machine.c +22 -0
@@ -590,6 +590,20 @@ static void machine_set_nvdimm(Object *obj, bool value, Error **errp) ms->nvdimms_state->is_enabled = value; } +static bool machine_get_spcr (Object *obj,Error **errp) +{ +MachineState *ms =MACHINE (obj); + +return ms->enable_spcr; +} + +static void machine_set_spcr (Object *obj,bool value,Error **errp) +{ +MachineState *ms =MACHINE (obj); + + ms->enable_spcr = value; +} +static bool machine_get_hmat (Object *obj,Error **errp) {MachineState *ms =MACHINE (obj);
@@ -1294,6 +1308,14 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } +/* SPCR */ + ms->enable_spcr = true; +object_property_add_bool (obj,"spcr" , machine_get_spcr, machine_set_spcr); +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 = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus;
hw/loongarch/virt-acpi-build.c +3 -1
@@ -557,7 +557,9 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *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) {
hw/riscv/virt-acpi-build.c +4 -1
@@ -680,7 +680,10 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *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); {
include/hw/boards.h +1 -0
@@ -444,6 +444,7 @@ struct MachineState {SmpCache smp_cache;struct NVDIMMState *nvdimms_state;struct NumaState *numa_state; +bool enable_spcr; };/*
qemu-options.hx +5 -0
@@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " nvdimm=on|off controls NVDIMM support (default=off)\n" " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" + " spcr=on|off controls ACPI SPCR support (default=on)\n" #ifdef CONFIG_POSIX " aux-ram-share=on|off allocate auxiliary guest RAM as 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=on|off`` + Enables or disables ACPI Serial Port Console Redirection Table + (SPCR) support. The default is on. + ``aux-ram-share=on|off`` Allocate auxiliary guest RAM as an anonymous file that is shareable with an external process. This option applies to
Signature · 1 line
2.49.0