@@ -1405,8 +1405,8 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)
VirtMachineState *vms = VIRT_MACHINE(obj);
bool acpi_enabled = false;
#ifdef CONFIG_ARM_VIRT
- bool acpi_enabled = virt_is_acpi_enabled(vms);
- #endif /* CONFIG_ARM_VIRT */
+ acpi_enabled = virt_is_acpi_enabled(vms);
+#endif /* CONFIG_ARM_VIRT */
assert(code == BUS_MCEERR_AR || code == BUS_MCEERR_AO);
@@ -1431,8 +1431,8 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)
kvm_cpu_synchronize_state(c);
#ifdef CONFIG_ACPI_APEI
if (acpi_ghes_record_errors(ACPI_HEST_SRC_ID_SEA, paddr)) {
- error_report("failed to record the error");
- abort();
+ error_report("failed to record the error");
+ abort();
}
#endif /* CONFIG_ACPI_APEI */
kvm_inject_arm_sea(c);