Commit 186ac05f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



- gdb signal handling fix
- add SO_REUSEPORT
- remove dead-code

# gpg: Signature made Mon 12 Nov 2018 20:48:23 GMT
# 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.1-pull-request:
  linux-user: Add support for SO_REUSEPORT
  linux-user: Clean up nios2 main loop signal handling
  linux-user: Don't call gdb_handlesig() before queue_signal()
  linux-user: Remove dead error-checking code

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a8a1b163 113a9dd7

linux-user/aarch64/cpu_loop.c

+5 −8
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
void cpu_loop(CPUARMState *env)

{

    CPUState *cs = CPU(arm_env_get_cpu(env));

    int trapnr, sig;

    int trapnr;

    abi_long ret;

    target_siginfo_t info;
@@ -121,13 +121,10 @@ void cpu_loop(CPUARMState *env) 
            break;

        case EXCP_DEBUG:

        case EXCP_BKPT:

            sig = gdb_handlesig(cs, TARGET_SIGTRAP);

            if (sig) {

                info.si_signo = sig;

            info.si_signo = TARGET_SIGTRAP;

            info.si_errno = 0;

            info.si_code = TARGET_TRAP_BRKPT;

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            }

            break;

        case EXCP_SEMIHOST:

            env->xregs[0] = do_arm_semihosting(env);

linux-user/alpha/cpu_loop.c

+4 −8
Original line number Diff line number Diff line
@@ -179,14 +179,10 @@ void cpu_loop(CPUAlphaState *env) 
            }

            break;

        case EXCP_DEBUG:

            info.si_signo = gdb_handlesig(cs, TARGET_SIGTRAP);

            if (info.si_signo) {

            info.si_signo = TARGET_SIGTRAP;

            info.si_errno = 0;

            info.si_code = TARGET_TRAP_BRKPT;

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            } else {

                arch_interrupt = false;

            }

            break;

        case EXCP_INTERRUPT:

            /* Just indicate that signals should be handled asap.  */

linux-user/arm/cpu_loop.c

+4 −12
Original line number Diff line number Diff line
@@ -397,18 +397,10 @@ void cpu_loop(CPUARMState *env) 
            break;

        case EXCP_DEBUG:

        excp_debug:

            {

                int sig;



                sig = gdb_handlesig(cs, TARGET_SIGTRAP);

                if (sig)

                  {

                    info.si_signo = sig;

            info.si_signo = TARGET_SIGTRAP;

            info.si_errno = 0;

            info.si_code = TARGET_TRAP_BRKPT;

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

                  }

            }

            break;

        case EXCP_KERNEL_TRAP:

            if (do_kernel_trap(env))

linux-user/cris/cpu_loop.c

+4 −12
Original line number Diff line number Diff line
@@ -64,18 +64,10 @@ void cpu_loop(CPUCRISState *env) 
            }

            break;

        case EXCP_DEBUG:

            {

                int sig;



                sig = gdb_handlesig(cs, TARGET_SIGTRAP);

                if (sig)

                  {

                    info.si_signo = sig;

            info.si_signo = TARGET_SIGTRAP;

            info.si_errno = 0;

            info.si_code = TARGET_TRAP_BRKPT;

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

                  }

            }

            break;

        case EXCP_ATOMIC:

            cpu_exec_step_atomic(cs);

linux-user/hppa/cpu_loop.c

+4 −7
Original line number Diff line number Diff line
@@ -182,13 +182,10 @@ void cpu_loop(CPUHPPAState *env) 
            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            break;

        case EXCP_DEBUG:

            trapnr = gdb_handlesig(cs, TARGET_SIGTRAP);

            if (trapnr) {

                info.si_signo = trapnr;

            info.si_signo = TARGET_SIGTRAP;

            info.si_errno = 0;

            info.si_code = TARGET_TRAP_BRKPT;

                queue_signal(env, trapnr, QEMU_SI_FAULT, &info);

            }

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            break;

        case EXCP_INTERRUPT:

            /* just indicate that signals should be handled asap */