Message ID | 20250620171342.92678-4-philmd@linaro.org |
---|---|
State | New |
Headers | show |
Series | accel: Preparatory cleanups for split-accel | expand |
On 6/20/25 10:12, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > accel/tcg/tcg-accel-ops.c | 2 -- > system/cpus.c | 2 ++ > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c > index da2e22a7dff..37b4b21f882 100644 > --- a/accel/tcg/tcg-accel-ops.c > +++ b/accel/tcg/tcg-accel-ops.c > @@ -93,8 +93,6 @@ static void tcg_cpu_reset_hold(CPUState *cpu) > /* mask must never be zero, except for A20 change call */ > void tcg_handle_interrupt(CPUState *cpu, int mask) > { > - g_assert(bql_locked()); > - > cpu->interrupt_request |= mask; > > /* > diff --git a/system/cpus.c b/system/cpus.c > index d16b0dff989..a43e0e4e796 100644 > --- a/system/cpus.c > +++ b/system/cpus.c > @@ -265,6 +265,8 @@ static void generic_handle_interrupt(CPUState *cpu, int mask) > > void cpu_interrupt(CPUState *cpu, int mask) > { > + g_assert(bql_locked()); > + > if (cpus_accel->handle_interrupt) { > cpus_accel->handle_interrupt(cpu, mask); > } else { Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index da2e22a7dff..37b4b21f882 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -93,8 +93,6 @@ static void tcg_cpu_reset_hold(CPUState *cpu) /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { - g_assert(bql_locked()); - cpu->interrupt_request |= mask; /* diff --git a/system/cpus.c b/system/cpus.c index d16b0dff989..a43e0e4e796 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -265,6 +265,8 @@ static void generic_handle_interrupt(CPUState *cpu, int mask) void cpu_interrupt(CPUState *cpu, int mask) { + g_assert(bql_locked()); + if (cpus_accel->handle_interrupt) { cpus_accel->handle_interrupt(cpu, mask); } else {
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- accel/tcg/tcg-accel-ops.c | 2 -- system/cpus.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)