aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-10-15 15:42:22 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-10-15 15:42:22 +0100
commit95ce6fcc91e37c96a05e1e44052ac61124539d4e (patch)
tree5b76822c9409d14af96e0859f467e139ec2a123c
parent913bc672cd4b49bf0130e160a4784f46ba2d0deb (diff)
downloadqemu-arm-95ce6fcc91e37c96a05e1e44052ac61124539d4e.tar.gz
fixupstest-ras
-rw-r--r--docs/specs/acpi_hest_ghes.rst11
-rw-r--r--hw/acpi/acpi_ghes.c8
2 files changed, 10 insertions, 9 deletions
diff --git a/docs/specs/acpi_hest_ghes.rst b/docs/specs/acpi_hest_ghes.rst
index 905b6d1f48..348825f9d3 100644
--- a/docs/specs/acpi_hest_ghes.rst
+++ b/docs/specs/acpi_hest_ghes.rst
@@ -1,10 +1,11 @@
APEI tables generating and CPER record
======================================
-Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD.
+..
+ Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., 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.
+ This work is licensed under the terms of the GNU GPL, version 2 or later.
+ See the COPYING file in the top-level directory.
Design Details
--------------
@@ -90,5 +91,5 @@ Design Details
is necessary for notifying the guest.
(10) This notification (in virtual hardware) will be handled by the guest
- kernel, guest APEI driver will read the CPER which is recorded by QEMU and
- do the recovery.
+ kernel, guest APEI driver will read the CPER which is recorded by QEMU and
+ do the recovery.
diff --git a/hw/acpi/acpi_ghes.c b/hw/acpi/acpi_ghes.c
index 1bd485063f..00e5410c37 100644
--- a/hw/acpi/acpi_ghes.c
+++ b/hw/acpi/acpi_ghes.c
@@ -132,8 +132,8 @@ static int acpi_ghes_record_mem_error(uint64_t error_block_address,
uint64_t current_block_length;
/* Memory Error Section Type */
QemuUUID mem_section_id_le = UEFI_CPER_SEC_PLATFORM_MEM;
- QemuUUID fru_id = {0};
- uint8_t fru_text[20] = {0};
+ QemuUUID fru_id = {};
+ uint8_t fru_text[20] = {};
/*
* Generic Error Status Block
@@ -327,7 +327,7 @@ void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_errors,
build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4);
/* Error Status Address */
- build_append_gas(table_data, AML_SYSTEM_MEMORY, 0x40, 0,
+ build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 0x40, 0,
4 /* QWord access */, 0);
bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id),
@@ -348,7 +348,7 @@ void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_errors,
* ACPI 6.1: 18.3.2.8 Generic Hardware Error Source
* version 2 (GHESv2 - Type 10)
*/
- build_append_gas(table_data, AML_SYSTEM_MEMORY, 0x40, 0,
+ build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 0x40, 0,
4 /* QWord access */, 0);
bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0),