From: Richard Henderson <richard.henderson@linaro.org>
To: Swetha Joshi <swethajoshi139@gmail.com>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org
Subject: Re: [PATCH_V3] Adding ifdefs to call the respective routines only when their configs are enabled
Date: Mon, 24 May 2021 20:20:30 -0700 [thread overview]
Message-ID: <331a819e-1745-4d4b-cc4a-82521a58186a@linaro.org> (raw)
In-Reply-To: <20210525025823.3208218-1-swethajoshi139@gmail.com>
On 5/24/21 7:58 PM, Swetha Joshi wrote:
> Signed-off-by: Swetha Joshi <swethajoshi139@gmail.com>
> ---
> target/arm/kvm64.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
You're still missing the commit message.
>
> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> index dff85f6db9..47a4d9d831 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 = virt_is_acpi_enabled(vms);
> + bool acpi_enabled = false;
> +#ifdef CONFIG_ARM_VIRT
> + 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 {
> +#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);
> }
Otherwise the actual patch looks ok.
I'm a bit surprised that you need the second hunk. I would have expected the
entire block to be optimized away with the 'acpi_enabled = false' being
propagated into the outermost IF.
r~
next prev parent reply other threads:[~2021-05-25 3:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 2:58 [PATCH_V3] Adding ifdefs to call the respective routines only when their configs are enabled Swetha Joshi
2021-05-25 3:20 ` Richard Henderson [this message]
[not found] ` <CALf2nmKjSB0FN1ZotYjLKF+BBsWiwLPUDjkNeRgq1HkG4P=Aow@mail.gmail.com>
2021-05-25 4:14 ` Richard Henderson
2021-05-25 6:45 ` Philippe Mathieu-Daudé
2021-05-25 9:04 ` Peter Maydell
2021-05-25 16:27 ` Swetha Joshi
2021-05-25 17:15 ` Peter Maydell
2021-05-26 17:32 ` Swetha Joshi
2021-05-26 18:19 ` Peter Maydell
2021-05-28 7:08 ` Dongjiu Geng
2021-05-28 19:41 ` Swetha Joshi
2021-06-02 13:44 ` Dongjiu Geng
2021-06-03 17:17 ` Swetha Joshi
2021-06-03 17:22 ` Peter Maydell
2021-06-03 17:30 ` Swetha Joshi
2021-06-04 5:25 ` Swetha Joshi
2021-06-04 9:03 ` Peter Maydell
2021-06-04 15:06 ` Swetha Joshi
2021-09-07 10:02 ` Peter Maydell
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=331a819e-1745-4d4b-cc4a-82521a58186a@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=swethajoshi139@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.