[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/4] i386: acpi: Don't build HPET ACPI entry if HPET is disabled
From: |
isaku . yamahata |
Subject: |
[PATCH 4/4] i386: acpi: Don't build HPET ACPI entry if HPET is disabled |
Date: |
Thu, 4 Feb 2021 00:04:11 -0800 |
From: Sean Christopherson <sean.j.christopherson@intel.com>
Omit HPET AML if the HPET is disabled, QEMU is not emulating it and the
guest may get confused by seeing HPET in the ACPI tables without a
"physical" device present.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
hw/i386/acpi-build.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 6e38f67120..a4fcd14a93 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1401,7 +1401,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(sb_scope, dev);
aml_append(dsdt, sb_scope);
- build_hpet_aml(dsdt);
+ if (misc->has_hpet) {
+ build_hpet_aml(dsdt);
+ }
build_piix4_isa_bridge(dsdt);
build_isa_devices_aml(dsdt);
if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
@@ -1446,7 +1448,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dsdt, sb_scope);
- build_hpet_aml(dsdt);
+ if (misc->has_hpet) {
+ build_hpet_aml(dsdt);
+ }
build_q35_isa_bridge(dsdt);
build_isa_devices_aml(dsdt);
build_q35_pci0_int(dsdt);
--
2.17.1
- [PATCH 0/4] ACPI related fixes, isaku . yamahata, 2021/02/04
- [PATCH 1/4] acpi/core: always set SCI_EN when SMM isn't supported, isaku . yamahata, 2021/02/04
- [PATCH 2/4] acpi: set fadt.smi_cmd to zero when SMM is not supported, isaku . yamahata, 2021/02/04
- [PATCH 3/4] hw/i386: declare ACPI mother board resource for MMCONFIG region, isaku . yamahata, 2021/02/04
- [PATCH 4/4] i386: acpi: Don't build HPET ACPI entry if HPET is disabled,
isaku . yamahata <=
- Re: [PATCH 0/4] ACPI related fixes, no-reply, 2021/02/04
- Re: [PATCH 0/4] ACPI related fixes, Michael S. Tsirkin, 2021/02/05