diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-22 14:39:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-22 14:39:53 +0100 |
| commit | 43fe62757b0b90af448e02c9bd55b62960556360 (patch) | |
| tree | b7513ba75b7ee74c5ce4d184957cc91664abb1cc /linux-user/main.c | |
| parent | fd3cced366958cc90f0a8caa8213471afde9bf3c (diff) | |
| parent | 29e03fcb62d413cf5fba06978346893ab72a1f64 (diff) | |
| download | hqemu-43fe62757b0b90af448e02c9bd55b62960556360.zip hqemu-43fe62757b0b90af448e02c9bd55b62960556360.tar.gz | |
Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging
* remotes/riku/linux-user-for-upstream: (22 commits)
linux-user: check return value of malloc()
linux-user: writev Partial Writes
linux-user: Support target-to-host translation of mlockall argument
linux-user: clock_nanosleep errno Handling on PPC
linux-user: Minimum Sig Handler Stack Size for PPC64 ELF V2
linux-user: Move get_ppc64_abi
linux-user: Detect fault in sched_rr_get_interval
linux-user: Handle NULL sched_param argument to sched_*
linux-user: Detect Negative Message Sizes in msgsnd System Call
linux-user: Conditionally Pass Attribute Pointer to mq_open()
linux-user: Make ipc syscall's third argument an abi_long
linux-user: Properly Handle semun Structure In Cross-Endian Situations
linux-user: Dereference Pointer Argument to ipc/semctl Sys Call
linux-user: PPC64 semid_ds Doesnt Include _unused1 and _unused2
linux-user: add setns and unshare
linux-user: support ioprio_{get, set} syscalls
linux-user: support timerfd_{create, gettime, settime} syscalls
linux-user: fix readlink handling with magic exe symlink
linux-user: Fix conversion of sigevent argument to timer_create
linux-user: Fix syscall instruction usermode emulation on X86_64
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
| -rw-r--r-- | linux-user/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index b453a39..472a16d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -309,7 +309,6 @@ void cpu_loop(CPUX86State *env) env->regs[8], env->regs[9], 0, 0); - env->eip = env->exception_next_eip; break; #endif case EXCP0B_NOSEG: |
