diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-22 16:16:22 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-22 16:16:22 -0600 |
| commit | 724c689357211cb929c9b957e1556f211d2b56db (patch) | |
| tree | 95121334d97267e1bdf869d181765002d5dbe8e1 /cpu-exec.c | |
| parent | b5ec5ce0e39d6e7ea707d5604a5f6d567dfd2f48 (diff) | |
| parent | 85199474d0df23b87f0b4a3e330401b59aac3ec0 (diff) | |
| download | focaccia-qemu-724c689357211cb929c9b957e1556f211d2b56db.tar.gz focaccia-qemu-724c689357211cb929c9b957e1556f211d2b56db.zip | |
Merge remote branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 7d5b96aa3c..184bddea31 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -230,11 +230,13 @@ int cpu_exec(CPUState *env1) env = env1; #if defined(TARGET_I386) - /* put eflags in CPU temporary format */ - CC_SRC = env->eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); - DF = 1 - (2 * ((env->eflags >> 10) & 1)); - CC_OP = CC_OP_EFLAGS; - env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); + if (!kvm_enabled()) { + /* put eflags in CPU temporary format */ + CC_SRC = env->eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); + DF = 1 - (2 * ((env->eflags >> 10) & 1)); + CC_OP = CC_OP_EFLAGS; + env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); + } #elif defined(TARGET_SPARC) #elif defined(TARGET_M68K) env->cc_op = CC_OP_FLAGS; |