Commit 3a340e84 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging 



Sanitize linux-user stdout

# gpg: Signature made Tue 10 Jul 2018 07:23:34 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-3.0-pull-request:
  linux-user: Report error message on stderr, rather than stdout
  linux-user: Do not report "syscall not implemented" by default
  linux-user: Do not report "Unsupported syscall" by default

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6784273a 84ca4fa9

linux-user/alpha/cpu_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void cpu_loop(CPUAlphaState *env) 
            arch_interrupt = false;

            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            fprintf(stderr, "Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(cs, stderr, fprintf, 0);

            exit(EXIT_FAILURE);

        }

linux-user/cris/cpu_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ void cpu_loop(CPUCRISState *env) 
            cpu_exec_step_atomic(cs);

            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            fprintf(stderr, "Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(cs, stderr, fprintf, 0);

            exit(EXIT_FAILURE);

        }

linux-user/cris/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, 
                    target_siginfo_t *info,

                     target_sigset_t *set, CPUCRISState *env)

{

    fprintf(stderr, "CRIS setup_rt_frame: not implemented\n");

    qemu_log_mask(LOG_UNIMP, "setup_rt_frame: not implemented\n");

}



long do_sigreturn(CPUCRISState *env)
@@ -183,6 +183,6 @@ badframe: 
long do_rt_sigreturn(CPUCRISState *env)

{

    trace_user_do_rt_sigreturn(env, 0);

    fprintf(stderr, "CRIS do_rt_sigreturn: not implemented\n");

    qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n");

    return -TARGET_ENOSYS;

}

linux-user/microblaze/cpu_loop.c

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void cpu_loop(CPUMBState *env) 
                    queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

                    break;

                default:

                    printf("Unhandled hw-exception: 0x%" PRIx64 "\n",

                    fprintf(stderr, "Unhandled hw-exception: 0x%" PRIx64 "\n",

                            env->sregs[SR_ESR] & ESR_EC_MASK);

                    cpu_dump_state(cs, stderr, fprintf, 0);

                    exit(EXIT_FAILURE);
@@ -130,7 +130,7 @@ void cpu_loop(CPUMBState *env) 
            cpu_exec_step_atomic(cs);

            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            fprintf(stderr, "Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(cs, stderr, fprintf, 0);

            exit(EXIT_FAILURE);

        }

linux-user/microblaze/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, 
                    target_siginfo_t *info,

                    target_sigset_t *set, CPUMBState *env)

{

    fprintf(stderr, "Microblaze setup_rt_frame: not implemented\n");

    qemu_log_mask(LOG_UNIMP, "setup_rt_frame: not implemented\n");

}



long do_sigreturn(CPUMBState *env)
@@ -240,6 +240,6 @@ badframe: 
long do_rt_sigreturn(CPUMBState *env)

{

    trace_user_do_rt_sigreturn(env, 0);

    fprintf(stderr, "Microblaze do_rt_sigreturn: not implemented\n");

    qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n");

    return -TARGET_ENOSYS;

}