| Message ID | ceb8b8f3537cf9f125fbdc86659bae25fdb34e3b.1724556967.git.mchehab+huawei@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add ACPI CPER firmware first error injection on ARM emulation | expand |
On Sun, 25 Aug 2024 05:45:59 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > The current function used to generate GHES data is specific for > memory errors. Give a better name for it, as we now have a generic > function as well. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/acpi/ghes-stub.c | 2 +- > hw/acpi/ghes.c | 2 +- > include/hw/acpi/ghes.h | 4 ++-- > target/arm/kvm.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c > index c315de1802d6..dd41b3fd91df 100644 > --- a/hw/acpi/ghes-stub.c > +++ b/hw/acpi/ghes-stub.c > @@ -11,7 +11,7 @@ > #include "qemu/osdep.h" > #include "hw/acpi/ghes.h" > > -int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) > +int acpi_ghes_memory_errors(uint8_t source_id, uint64_t physical_address) > { > return -1; > } > diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c > index 3190eb954de4..10ed9c0614ff 100644 > --- a/hw/acpi/ghes.c > +++ b/hw/acpi/ghes.c > @@ -494,7 +494,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, > cpu_physical_memory_write(cper_addr, cper, len); > } > > -int acpi_ghes_record_errors(int source_id, uint64_t physical_address) > +int acpi_ghes_memory_errors(int source_id, uint64_t physical_address) > { > /* Memory Error Section Type */ > const uint8_t guid[] = > diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h > index 4b5af86ec077..be53b7c53c91 100644 > --- a/include/hw/acpi/ghes.h > +++ b/include/hw/acpi/ghes.h > @@ -70,7 +70,7 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, > const char *oem_id, const char *oem_table_id); > void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s, > GArray *hardware_errors); > -int acpi_ghes_record_errors(int source_id, > +int acpi_ghes_memory_errors(int source_id, > uint64_t error_physical_addr); > void ghes_record_cper_errors(const void *cper, size_t len, > uint16_t source_id, Error **errp); > @@ -79,7 +79,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, > * acpi_ghes_present: Report whether ACPI GHES table is present > * > * Returns: true if the system has an ACPI GHES table and it is > - * safe to call acpi_ghes_record_errors() to record a memory error. > + * safe to call acpi_ghes_memory_errors() to record a memory error. > */ > bool acpi_ghes_present(void); > #endif > diff --git a/target/arm/kvm.c b/target/arm/kvm.c > index 8c4c8263b85a..8e63e9a59a5e 100644 > --- a/target/arm/kvm.c > +++ b/target/arm/kvm.c > @@ -2373,7 +2373,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) > */ > if (code == BUS_MCEERR_AR) { > kvm_cpu_synchronize_state(c); > - if (!acpi_ghes_record_errors(ARM_ACPI_HEST_SRC_ID_SEA, > + if (!acpi_ghes_memory_errors(ARM_ACPI_HEST_SRC_ID_SEA, > paddr)) { > kvm_inject_arm_sea(c); > } else {
diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c index c315de1802d6..dd41b3fd91df 100644 --- a/hw/acpi/ghes-stub.c +++ b/hw/acpi/ghes-stub.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/acpi/ghes.h" -int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) +int acpi_ghes_memory_errors(uint8_t source_id, uint64_t physical_address) { return -1; } diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 3190eb954de4..10ed9c0614ff 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -494,7 +494,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, cpu_physical_memory_write(cper_addr, cper, len); } -int acpi_ghes_record_errors(int source_id, uint64_t physical_address) +int acpi_ghes_memory_errors(int source_id, uint64_t physical_address) { /* Memory Error Section Type */ const uint8_t guid[] = diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h index 4b5af86ec077..be53b7c53c91 100644 --- a/include/hw/acpi/ghes.h +++ b/include/hw/acpi/ghes.h @@ -70,7 +70,7 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id); void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s, GArray *hardware_errors); -int acpi_ghes_record_errors(int source_id, +int acpi_ghes_memory_errors(int source_id, uint64_t error_physical_addr); void ghes_record_cper_errors(const void *cper, size_t len, uint16_t source_id, Error **errp); @@ -79,7 +79,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, * acpi_ghes_present: Report whether ACPI GHES table is present * * Returns: true if the system has an ACPI GHES table and it is - * safe to call acpi_ghes_record_errors() to record a memory error. + * safe to call acpi_ghes_memory_errors() to record a memory error. */ bool acpi_ghes_present(void); #endif diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 8c4c8263b85a..8e63e9a59a5e 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2373,7 +2373,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) */ if (code == BUS_MCEERR_AR) { kvm_cpu_synchronize_state(c); - if (!acpi_ghes_record_errors(ARM_ACPI_HEST_SRC_ID_SEA, + if (!acpi_ghes_memory_errors(ARM_ACPI_HEST_SRC_ID_SEA, paddr)) { kvm_inject_arm_sea(c); } else {
The current function used to generate GHES data is specific for memory errors. Give a better name for it, as we now have a generic function as well. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 2 +- include/hw/acpi/ghes.h | 4 ++-- target/arm/kvm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)