From: Swetha Joshi <swethajoshi139@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Swetha <swjoshi@microsoft.com>
Subject: [PATCH] Adding ifdefs to call the respective routines only when their configs are enabled
Date: Mon, 24 May 2021 15:56:08 -0700 [thread overview]
Message-ID: <20210524225608.3191809-1-swethajoshi139@gmail.com> (raw)
From: Swetha <swjoshi@microsoft.com>
Signed-off-by: Swetha <swjoshi@microsoft.com>
---
target/arm/kvm64.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index dff85f6db9..724ce78265 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -1403,7 +1403,10 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)
hwaddr paddr;
Object *obj = qdev_get_machine();
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 */
assert(code == BUS_MCEERR_AR || code == BUS_MCEERR_AO);
@@ -1426,12 +1429,13 @@ 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(ACPI_HEST_SRC_ID_SEA, paddr)) {
- kvm_inject_arm_sea(c);
- } else {
- error_report("failed to record the error");
- abort();
+#ifdef CONFIG_ACPI_APEI
+ if (acpi_ghes_record_errors(ACPI_HEST_SRC_ID_SEA, paddr)) {
+ error_report("failed to record the error");
+ abort();
}
+#endif /* CONFIG_ACPI_APEI */
+ kvm_inject_arm_sea(c);
}
return;
}
--
2.25.1
next reply other threads:[~2021-05-25 0:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 22:56 Swetha Joshi [this message]
2021-05-25 0:48 ` [PATCH] Adding ifdefs to call the respective routines only when their configs are enabled no-reply
2021-05-25 1:53 ` Richard Henderson
2021-05-25 2:14 ` Swetha Joshi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210524225608.3191809-1-swethajoshi139@gmail.com \
--to=swethajoshi139@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=swjoshi@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).