diff options
| author | Peter Maydell | 2018-04-11 15:23:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-11 15:23:56 +0200 |
| commit | 6523eaca378df1455481f1cec65ada589d65df0e (patch) | |
| tree | bcab49b7b0fe2a58cc38729c94477e03b2dde022 /accel/tcg/user-exec.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.12-pull-r... (diff) | |
| parent | icount: fix cpu_restore_state_from_tb for non-tb-exit cases (diff) | |
| download | qemu-6523eaca378df1455481f1cec65ada589d65df0e.tar.gz qemu-6523eaca378df1455481f1cec65ada589d65df0e.tar.xz qemu-6523eaca378df1455481f1cec65ada589d65df0e.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180411' into staging
Handle read-modify-write i/o with icount
# gpg: Signature made Wed 11 Apr 2018 00:07:23 BST
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-tcg-20180411:
icount: fix cpu_restore_state_from_tb for non-tb-exit cases
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel/tcg/user-exec.c')
| -rw-r--r-- | accel/tcg/user-exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 77899584f2..26a3ffbba1 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -168,7 +168,7 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, } /* Now we have a real cpu fault. */ - cpu_restore_state(cpu, pc); + cpu_restore_state(cpu, pc, true); sigprocmask(SIG_SETMASK, old_set, NULL); cpu_loop_exit(cpu); |