[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/28] hw/acpi: Provide stub version of acpi_ghes_record_errors()
From: |
Peter Maydell |
Subject: |
[PULL 09/28] hw/acpi: Provide stub version of acpi_ghes_record_errors() |
Date: |
Tue, 15 Jun 2021 16:43:46 +0100 |
Generic code in target/arm wants to call acpi_ghes_record_errors();
provide a stub version so that we don't fail to link when
CONFIG_ACPI_APEI is not set. This requires us to add a new
ghes-stub.c file to contain it and the meson.build mechanics
to use it when appropriate.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Dongjiu Geng <gengdongjiu1@gmail.com>
Message-id: 20210603171259.27962-2-peter.maydell@linaro.org
---
hw/acpi/ghes-stub.c | 17 +++++++++++++++++
hw/acpi/meson.build | 6 +++---
2 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 hw/acpi/ghes-stub.c
diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c
new file mode 100644
index 00000000000..9faba043b85
--- /dev/null
+++ b/hw/acpi/ghes-stub.c
@@ -0,0 +1,17 @@
+/*
+ * Support for generating APEI tables and recording CPER for Guests:
+ * stub functions.
+ *
+ * Copyright (c) 2021 Linaro, Ltd
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/acpi/ghes.h"
+
+int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)
+{
+ return -1;
+}
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index dd69577212a..03ea43f8627 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -13,13 +13,13 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true:
files('pci.c'))
acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c'))
acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true:
files('generic_event_device.c'))
acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c'))
-acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'),
if_false:('ghes-stub.c'))
acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c',
'pcihp.c'), if_false: files('acpi-stub.c'))
acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false:
files('ipmi-stub.c'))
acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
-softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c',
'aml-build-stub.c'))
+softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c',
'aml-build-stub.c', 'ghes-stub.c'))
softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c',
'aml-build-stub.c',
- 'acpi-x86-stub.c',
'ipmi-stub.c'))
+ 'acpi-x86-stub.c',
'ipmi-stub.c', 'ghes-stub.c'))
--
2.20.1
- [PULL 02/28] target/arm: Diagnose UNALLOCATED in disas_simd_two_reg_misc_fp16, (continued)
- [PULL 02/28] target/arm: Diagnose UNALLOCATED in disas_simd_two_reg_misc_fp16, Peter Maydell, 2021/06/15
- [PULL 03/28] target/arm: Remove fprintf from disas_simd_mod_imm, Peter Maydell, 2021/06/15
- [PULL 04/28] target/arm: Diagnose UNALLOCATED in disas_simd_three_reg_same_fp16, Peter Maydell, 2021/06/15
- [PULL 05/28] hw: virt: consider hw_compat_6_0, Peter Maydell, 2021/06/15
- [PULL 07/28] hw/arm: quanta-gbs-bmc add i2c comments, Peter Maydell, 2021/06/15
- [PULL 06/28] hw/arm: add quanta-gbs-bmc machine, Peter Maydell, 2021/06/15
- [PULL 08/28] hw/intc/armv7m_nvic: Remove stale comment, Peter Maydell, 2021/06/15
- [PULL 12/28] target/arm: Fix mte page crossing test, Peter Maydell, 2021/06/15
- [PULL 11/28] target/arm: Use acpi_ghes_present() to see if we report ACPI memory errors, Peter Maydell, 2021/06/15
- [PULL 13/28] hw/arm: gsj add i2c comments, Peter Maydell, 2021/06/15
- [PULL 09/28] hw/acpi: Provide stub version of acpi_ghes_record_errors(),
Peter Maydell <=
- [PULL 14/28] hw/arm: gsj add pca9548, Peter Maydell, 2021/06/15
- [PULL 15/28] hw/arm: quanta-q71l add pca954x muxes, Peter Maydell, 2021/06/15
- [PULL 10/28] hw/acpi: Provide function acpi_ghes_present(), Peter Maydell, 2021/06/15
- [PULL 19/28] target/arm: Add handling for PSR.ECI/ICI, Peter Maydell, 2021/06/15
- [PULL 20/28] target/arm: Let vfp_access_check() handle late NOCP checks, Peter Maydell, 2021/06/15
- [PULL 21/28] target/arm: Implement MVE LCTP, Peter Maydell, 2021/06/15
- [PULL 22/28] target/arm: Implement MVE WLSTP insn, Peter Maydell, 2021/06/15
- [PULL 24/28] target/arm: Implement MVE LETP insn, Peter Maydell, 2021/06/15
- [PULL 28/28] include/qemu/int128.h: Add function to create Int128 from int64_t, Peter Maydell, 2021/06/15
- [PULL 17/28] target/arm: Enable FPSCR.QC bit for MVE, Peter Maydell, 2021/06/15