On Fri, Nov 18, 2022 at 7:22 PM Richard Henderson
<richard.hender...@linaro.org> wrote:
>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> Cc: Alistair Francis <alistair.fran...@wdc.com>
> Cc: Bin Meng <bin.m...@windriver.com>
> Cc: qemu-ri...@nongnu.org
> ---
> target/riscv/cpu_helper.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
> index 278d163803..241d06bab8 100644
> --- a/target/riscv/cpu_helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -610,7 +610,6 @@ uint64_t riscv_cpu_update_mip(RISCVCPU *cpu, uint64_t
> mask, uint64_t value)
> CPURISCVState *env = &cpu->env;
> CPUState *cs = CPU(cpu);
> uint64_t gein, vsgein = 0, vstip = 0, old = env->mip;
> - bool locked = false;
>
> if (riscv_cpu_virt_enabled(env)) {
> gein = get_field(env->hstatus, HSTATUS_VGEIN);
> @@ -621,10 +620,7 @@ uint64_t riscv_cpu_update_mip(RISCVCPU *cpu, uint64_t
> mask, uint64_t value)
> mask = ((mask == MIP_VSTIP) && env->vstime_irq) ? 0 : mask;
> vstip = env->vstime_irq ? MIP_VSTIP : 0;
>
> - if (!qemu_mutex_iothread_locked()) {
> - locked = true;
> - qemu_mutex_lock_iothread();
> - }
> + QEMU_IOTHREAD_LOCK_GUARD();
>
> env->mip = (env->mip & ~mask) | (value & mask);
>
> @@ -634,10 +630,6 @@ uint64_t riscv_cpu_update_mip(RISCVCPU *cpu, uint64_t
> mask, uint64_t value)
> cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
> }
>
> - if (locked) {
> - qemu_mutex_unlock_iothread();
> - }
> -
> return old;
> }
>
> --
> 2.34.1
>
>
