Re: [PATCH-for-8.0 1/4] cputlb: Restrict SavedIOTLB to system emulation

[Philippe Mathieu-Daudé]

On 8/12/22 09:40, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@linaro.org> writes:
>
> > Commit 2f3a57ee47 ("cputlb: ensure we save the IOTLB data in
> > case of reset") added the SavedIOTLB structure -- which is
> > system emulation specific -- in the generic CPUState structure.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > ---
> >   accel/tcg/cputlb.c    | 4 ++--
> >   include/hw/core/cpu.h | 6 ++++--
> >   2 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> > index 6f1c00682b..0ea96fbcdf 100644
> > --- a/accel/tcg/cputlb.c
> > +++ b/accel/tcg/cputlb.c
> > @@ -1395,7 +1395,7 @@ static uint64_t io_readx(CPUArchState *env, 
> > CPUTLBEntryFull *full,
> >   static void save_iotlb_data(CPUState *cs, MemoryRegionSection *section,
> >                               hwaddr mr_offset)
> >   {
> > -#ifdef CONFIG_PLUGIN
> > +#if defined(CONFIG_PLUGIN) && !defined(CONFIG_USER_ONLY)
>
> cputlb is softmmu only so I don't think we need to check CONFIG_USER_ONLY here.
Indeed, only "hw/core/cpu.h" requires it, thanks!