[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH RESEND v12 11/12] hw/arm/virt: Add RAS platform versio
From: |
Dongjiu Geng |
Subject: |
[Qemu-arm] [PATCH RESEND v12 11/12] hw/arm/virt: Add RAS platform version for migration |
Date: |
Wed, 22 Nov 2017 02:37:13 +0800 |
Support this feature since version 2.10, disable it by
default in the old version.
Signed-off-by: Dongjiu Geng <address@hidden>
---
Address Shannon's comments to add platform version in [1].
[1]: https://lkml.org/lkml/2017/8/25/821
---
hw/arm/virt-acpi-build.c | 14 +++++++++-----
hw/arm/virt.c | 4 ++++
include/hw/arm/virt.h | 1 +
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 92c8c38..961b67d 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -801,10 +801,11 @@ void virt_acpi_build(VirtMachineState *vms,
AcpiBuildTables *tables)
acpi_add_table(table_offsets, tables_blob);
build_spcr(tables_blob, tables->linker, vms);
- acpi_add_table(table_offsets, tables_blob);
- build_error_block(tables->hardware_errors, tables->linker);
- build_apei_ghes(tables_blob, tables->hardware_errors, tables->linker);
-
+ if (!vmc->no_ras) {
+ acpi_add_table(table_offsets, tables_blob);
+ build_error_block(tables->hardware_errors, tables->linker);
+ build_apei_ghes(tables_blob, tables->hardware_errors, tables->linker);
+ }
if (nb_numa_nodes > 0) {
acpi_add_table(table_offsets, tables_blob);
@@ -891,6 +892,7 @@ static const VMStateDescription vmstate_virt_acpi_build = {
void virt_acpi_setup(VirtMachineState *vms)
{
+ VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
AcpiBuildTables tables;
AcpiBuildState *build_state;
@@ -922,7 +924,9 @@ void virt_acpi_setup(VirtMachineState *vms)
fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
acpi_data_len(tables.tcpalog));
- ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors);
+ if (!vmc->no_ras) {
+ ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors);
+ }
build_state->rsdp_mr = acpi_add_rom_blob(build_state, tables.rsdp,
ACPI_BUILD_RSDP_FILE, 0);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 68495c2..ab79988 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1732,8 +1732,12 @@ static void virt_2_9_instance_init(Object *obj)
static void virt_machine_2_9_options(MachineClass *mc)
{
+ VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
+
virt_machine_2_10_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_9);
+ /* memory recovery feature was introduced since 2.10 */
+ vmc->no_ras = true;
}
DEFINE_VIRT_MACHINE(2, 9)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 33b0ff3..8fbd664 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -84,6 +84,7 @@ typedef struct {
bool disallow_affinity_adjustment;
bool no_its;
bool no_pmu;
+ bool no_ras;
bool claim_edge_triggered_timers;
} VirtMachineClass;
--
1.8.3.1
- [Qemu-arm] [PATCH RESEND v12 04/12] ACPI: enable APEI GHES in the configure file and build it, (continued)
- [Qemu-arm] [PATCH RESEND v12 04/12] ACPI: enable APEI GHES in the configure file and build it, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 09/12] Move related hwpoison page function to accel/kvm/ folder, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 08/12] target-arm: kvm64: inject synchronous External Abort, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 05/12] linux-headers: sync against Linux v4.14-rc8, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 01/12] ACPI: add related GHES structures and macros definition, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 07/12] target-arm: handle SError interrupt exception from the guest OS, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 02/12] ACPI: Add APEI GHES table generation and CPER record support, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 10/12] ARM: ACPI: Add _E04 for hardware error device, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 12/12] target-arm: kvm64: handle SIGBUS signal from kernel or KVM, Dongjiu Geng, 2017/11/21
- [Qemu-arm] [PATCH RESEND v12 11/12] hw/arm/virt: Add RAS platform version for migration,
Dongjiu Geng <=
- [Qemu-arm] [PATCH RESEND v12 06/12] target-arm: kvm64: detect whether can set vsesr_el2, Dongjiu Geng, 2017/11/21
- Re: [Qemu-arm] [PATCH RESEND v12 00/12] Add RAS virtualization support in QEMU, gengdongjiu, 2017/11/24