diff options
| author | Anthony Liguori | 2013-10-10 22:16:25 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-10-10 22:16:25 +0200 |
| commit | 39c153b80f890dc5f02465dc59992e195abd5f40 (patch) | |
| tree | d99c2c332f8addb7bf64e1a7ead1d5a2b0a54089 /cpu-exec.c | |
| parent | Merge remote-tracking branch 'amit/char-remove-watch-on-unplug' into staging (diff) | |
| parent | cpu: Drop cpu_model_str from CPU_COMMON (diff) | |
| download | qemu-39c153b80f890dc5f02465dc59992e195abd5f40.tar.gz qemu-39c153b80f890dc5f02465dc59992e195abd5f40.tar.xz qemu-39c153b80f890dc5f02465dc59992e195abd5f40.zip | |
Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
QOM CPUState refactorings / X86CPU
* Fix for X86CPU model field of qemu32/qemu64 CPU models
* Bug fix for longjmp on FreeBSD
* Removal of unused function
* Confinement of clone syscall infrastructure to linux-user
# gpg: Signature made Wed 09 Oct 2013 03:40:51 AM PDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found
# By Andreas Färber (2) and others
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
cpu: Drop cpu_model_str from CPU_COMMON
cpu: Move cpu_copy() into linux-user
cputlb: Remove dead function tlb_update_dirty()
cpu-exec: Also reload CPUClass *cc after longjmp return in cpu_exec()
target-i386: Set model=6 on qemu64 & qemu32 CPU models
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 5a4399509e..30cfa2a63a 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -681,6 +681,10 @@ int cpu_exec(CPUArchState *env) * local variables as longjmp is marked 'noreturn'. */ cpu = current_cpu; env = cpu->env_ptr; +#if !(defined(CONFIG_USER_ONLY) && \ + (defined(TARGET_M68K) || defined(TARGET_PPC) || defined(TARGET_S390X))) + cc = CPU_GET_CLASS(cpu); +#endif } } /* for(;;) */ |