On Thu, Sep 2, 2021 at 9:19 AM Philippe Mathieu-Daudé <f4...@amsat.org>
wrote:
> cpu_get_pic_interrupt() is now unreachable from user-mode,
> delete the unnecessary stubs.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> target/i386/cpu.h | 2 +-
> bsd-user/main.c | 7 -------
> linux-user/main.c | 7 -------
> 3 files changed, 1 insertion(+), 15 deletions(-)
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
> diff --git a/target/i386/cpu.h b/target/i386/cpu.h
> index c241bc183d2..c7cc65e92d5 100644
> --- a/target/i386/cpu.h
> +++ b/target/i386/cpu.h
> @@ -1832,9 +1832,9 @@ int x86_cpu_gdb_write_register(CPUState *cpu,
> uint8_t *buf, int reg);
> void x86_cpu_list(void);
> int cpu_x86_support_mca_broadcast(CPUX86State *env);
>
> +#ifndef CONFIG_USER_ONLY
> int cpu_get_pic_interrupt(CPUX86State *s);
>
> -#ifndef CONFIG_USER_ONLY
> /* MSDOS compatibility mode FPU exception support */
> void x86_register_ferr_irq(qemu_irq irq);
> void fpu_check_raise_ferr_irq(CPUX86State *s);
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index fe66204b6b7..e358c38c353 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -66,13 +66,6 @@ void gemu_log(const char *fmt, ...)
> va_end(ap);
> }
>
> -#if defined(TARGET_I386)
> -int cpu_get_pic_interrupt(CPUX86State *env)
> -{
> - return -1;
> -}
> -#endif
> -
> void fork_start(void)
> {
> }
>
Love it, but either you or I will have to rebase based on which of us lands
in the tree first :).
For me, the rebase will be easy though.
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 37ed50d98e2..f5c0a82427b 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -120,13 +120,6 @@ const char *qemu_uname_release;
> by remapping the process stack directly at the right place */
> unsigned long guest_stack_size = 8 * 1024 * 1024UL;
>
> -#if defined(TARGET_I386)
> -int cpu_get_pic_interrupt(CPUX86State *env)
> -{
> - return -1;
> -}
> -#endif
> -
> /***********************************************************/
> /* Helper routines for implementing atomic operations. */
>
> --
> 2.31.1
>
>
