Commit e7aab6d6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20150323' into staging 



linux-user patches for 2.3-rc1

# gpg: Signature made Mon Mar 23 13:51:56 2015 GMT using RSA key ID DE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg:                 aka "Riku Voipio <riku.voipio@linaro.org>"

* remotes/riku/tags/pull-linux-user-20150323:
  linux-user: fix broken cpu_copy()
  linux-user: fix emulation of splice syscall
  linux-user/main.c: Remove redundant end_exclusive() in arm_kernel_cmpxchg64_helper()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3c6c9fe0 61c7480f

linux-user/main.c

+1 −3
Original line number Diff line number Diff line
@@ -525,8 +525,6 @@ segv: 
    info.si_code = TARGET_SEGV_MAPERR;

    info._sifields._sigfault._addr = env->exception.vaddress;

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



    end_exclusive();

}



/* Handle a jump to the kernel code page.  */
@@ -3453,7 +3451,7 @@ CPUArchState *cpu_copy(CPUArchState *env) 
{

    CPUState *cpu = ENV_GET_CPU(env);

    CPUState *new_cpu = cpu_init(cpu_model);

    CPUArchState *new_env = cpu->env_ptr;

    CPUArchState *new_env = new_cpu->env_ptr;

    CPUBreakpoint *bp;

    CPUWatchpoint *wp;

linux-user/syscall.c

+18 −4
Original line number Diff line number Diff line
@@ -9352,14 +9352,28 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
            loff_t loff_in, loff_out;

            loff_t *ploff_in = NULL, *ploff_out = NULL;

            if (arg2) {

                get_user_u64(loff_in, arg2);

                if (get_user_u64(loff_in, arg2)) {

                    goto efault;

                }

                ploff_in = &loff_in;

            }

            if (arg4) {

                get_user_u64(loff_out, arg2);

                if (get_user_u64(loff_out, arg4)) {

                    goto efault;

                }

                ploff_out = &loff_out;

            }

            ret = get_errno(splice(arg1, ploff_in, arg3, ploff_out, arg5, arg6));

            if (arg2) {

                if (put_user_u64(loff_in, arg2)) {

                    goto efault;

                }

            }

            if (arg4) {

                if (put_user_u64(loff_out, arg4)) {

                    goto efault;

                }

            }

        }

        break;

#endif