On Wed, Feb 28, 2024 at 7:14 PM Michael Tokarev <m...@tls.msk.ru> wrote:
>
> 28.02.2024 11:06, Paolo Bonzini:
>
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index 647371198c7..ba6d7b80a7f 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -7732,7 +7732,7 @@ static bool x86_cpu_has_work(CPUState *cs)
> > return x86_cpu_pending_interrupt(cs, cs->interrupt_request) != 0;
> > }
> >
> > -static int x86_cpu_mmu_index(CPUState *env, bool ifetch)
> > +static int x86_cpu_mmu_index(CPUState *cs, bool ifetch)
> > {
> > CPUX86State *env = cpu_env(cs);
> > int mmu_index_32 = (env->hflags & HF_CS64_MASK) ? 1 : 0;
>
>
> This is an interesting change. It looks like previous patch
> broke this very line, and this patch restored it.
>
> This is an unrelated change to the problem at hand.
It's a rebase hiccup, indeed. :(
Paolo
