On Sat, 9 May 2020 15:09:06 +0200 Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> All this code is guarded checking CONFIG_USER_ONLY definition. > Drop the duplicated checks. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > Suspicious ifdef'ry in s390_handle_wait() from commit 83f7f32901c. > --- > target/s390x/helper.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index 09f60406aa..26e3b366e8 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -33,6 +33,7 @@ > #endif > > #ifndef CONFIG_USER_ONLY > + I'd probably not have added the whitespace here... > void s390x_tod_timer(void *opaque) > { > cpu_inject_clock_comparator((S390CPU *) opaque); (...) > @@ -328,6 +324,7 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, > hwaddr len) > cpu_physical_memory_unmap(sa, len, 1, len); > return 0; > } > + ...and here, but I don't feel strongly about it. > #endif /* CONFIG_USER_ONLY */ > > void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags) Reviewed-by: Cornelia Huck <coh...@redhat.com>