From: Cornelia Huck <cohuck@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
David Hildenbrand <david@redhat.com>,
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
qemu-devel@nongnu.org, Laurent Vivier <laurent@vivier.eu>,
Max Filippov <jcmvbkbc@gmail.com>,
Alistair Francis <Alistair.Francis@wdc.com>,
Marek Vasut <marex@denx.de>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>,
David Gibson <david@gibson.dropbear.id.au>,
Artyom Tarasenko <atar4qemu@gmail.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org,
Stafford Horne <shorne@gmail.com>,
Richard Henderson <rth@twiddle.net>,
qemu-riscv@nongnu.org,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Chris Wulff <crwulff@gmail.com>,
Roman Bolshakov <r.bolshakov@yadro.com>,
qemu-ppc@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [PATCH 08/11] target/s390x: Restrict system-mode declarations
Date: Tue, 12 May 2020 08:01:46 +0200 [thread overview]
Message-ID: <20200512080146.7d0f4ae2.cohuck@redhat.com> (raw)
In-Reply-To: <2bb91290-32c5-997d-c689-4d651836c7fc@amsat.org>
On Mon, 11 May 2020 14:21:27 +0200
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> On 5/11/20 12:48 PM, Cornelia Huck wrote:
> > On Sat, 9 May 2020 15:09:07 +0200
> > Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> >
> >> As these declarations are restricted to !CONFIG_USER_ONLY in
> >> helper.c, only declare them when system-mode emulation is used.
> >>
> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> >> ---
> >> target/s390x/internal.h | 11 ++++++-----
> >> 1 file changed, 6 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/target/s390x/internal.h b/target/s390x/internal.h
> >> index c1678dc6bc..ddc276cdf4 100644
> >> --- a/target/s390x/internal.h
> >> +++ b/target/s390x/internal.h
> >> @@ -236,7 +236,6 @@ int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
> >>
> >> /* cc_helper.c */
> >> const char *cc_name(enum cc_op cc_op);
> >> -void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);
> >> uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst,
> >> uint64_t vr);
> >>
> >> @@ -303,18 +302,20 @@ void s390_cpu_gdb_init(CPUState *cs);
> >>
> >> /* helper.c */
> >> void s390_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
> >> -hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
> >> -hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);
> >> +void do_restart_interrupt(CPUS390XState *env);
> >> +
> >> +#ifndef CONFIG_USER_ONLY
> >> +void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);
> >
> > load_psw() is in cc_helper.c (and not in helper.c). Rather add the
> > #ifndef above, even if it is a bit awkward? Otherwise, the wrong
> > comment makes it confusing.
>
> I've been tempted to remove the kinda outdated /* helper.c */ comment...
I don't think they're really outdated, but not sure how useful they are
to people. I'm not personally attached to them, other opinions?
>
> >
> >> uint64_t get_psw_mask(CPUS390XState *env);
> >> void s390_cpu_recompute_watchpoints(CPUState *cs);
> >> void s390x_tod_timer(void *opaque);
> >> void s390x_cpu_timer(void *opaque);
> >> -void do_restart_interrupt(CPUS390XState *env);
> >> void s390_handle_wait(S390CPU *cpu);
> >> +hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
> >> +hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);
> >> #define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)
> >> int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch);
> >> int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len);
> >> -#ifndef CONFIG_USER_ONLY
> >> LowCore *cpu_map_lowcore(CPUS390XState *env);
> >> void cpu_unmap_lowcore(LowCore *lowcore);
> >> #endif /* CONFIG_USER_ONLY */
> >
> >
>
next prev parent reply other threads:[~2020-05-12 6:02 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 13:08 [PATCH 00/11] exec/cpu: Poison 'hwaddr' type in user-mode emulation Philippe Mathieu-Daudé
2020-05-09 13:09 ` [PATCH 01/11] plugins: Restrict functions handling hwaddr to system-mode Philippe Mathieu-Daudé
2020-05-10 10:44 ` Philippe Mathieu-Daudé
2020-05-09 13:09 ` [PATCH 02/11] sysemu/accel: Restrict machine methods " Philippe Mathieu-Daudé
2020-05-11 9:54 ` Edgar E. Iglesias
2020-05-11 10:17 ` Cornelia Huck
2020-05-09 13:09 ` [PATCH 03/11] sysemu/tcg: Only declare tcg_allowed when TCG is available Philippe Mathieu-Daudé
2020-05-11 9:46 ` Edgar E. Iglesias
2020-05-11 10:20 ` Cornelia Huck
2020-05-09 13:09 ` [PATCH 04/11] sysemu/hvf: Only declare hvf_allowed when HVF " Philippe Mathieu-Daudé
2020-05-11 9:47 ` Edgar E. Iglesias
2020-05-11 10:22 ` Cornelia Huck
2020-06-03 23:35 ` Cameron Esfahani
2020-05-09 13:09 ` [PATCH 05/11] target/ppc: Restrict PPCVirtualHypervisorClass to system-mode Philippe Mathieu-Daudé
2020-05-11 1:15 ` David Gibson
2020-05-09 13:09 ` [PATCH 06/11] target/s390x: Only compile decode_basedisp() on system-mode Philippe Mathieu-Daudé
2020-05-11 10:39 ` Cornelia Huck
2020-05-09 13:09 ` [PATCH 07/11] target/s390x/helper: Clean ifdef'ry Philippe Mathieu-Daudé
2020-05-11 9:43 ` David Hildenbrand
2020-05-11 10:44 ` Cornelia Huck
2020-05-09 13:09 ` [PATCH 08/11] target/s390x: Restrict system-mode declarations Philippe Mathieu-Daudé
2020-05-11 10:48 ` Cornelia Huck
2020-05-11 12:21 ` Philippe Mathieu-Daudé
2020-05-12 6:01 ` Cornelia Huck [this message]
2020-05-12 6:46 ` Philippe Mathieu-Daudé
2020-05-12 6:52 ` David Hildenbrand
2020-05-09 13:09 ` [PATCH 09/11] target/cpu: Restrict handlers using hwaddr type to system-mode Philippe Mathieu-Daudé
2020-05-09 16:08 ` Philippe Mathieu-Daudé
2020-05-09 20:01 ` Philippe Mathieu-Daudé
2020-05-09 21:03 ` Paolo Bonzini
2020-05-11 1:16 ` David Gibson
2020-05-09 13:09 ` [PATCH 10/11] exec: Use 'cpu-common.h' instead of system-mode specific 'hwaddr.h' Philippe Mathieu-Daudé
2020-05-09 13:09 ` [PATCH 11/11] exec/cpu-common: Poison hwaddr type in user-mode emulation Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200512080146.7d0f4ae2.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=crwulff@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=jcmvbkbc@gmail.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=laurent@vivier.eu \
--cc=marex@denx.de \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=rth@twiddle.net \
--cc=sagark@eecs.berkeley.edu \
--cc=shorne@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).