Merge remote-tracking branch 'remotes/kraxel/tags/usb-20170720-pull-request' into...

[qemu.git] / target / i386 / machine.c

diff --git a/target/i386/machine.c b/target/i386/machine.c
index 53587ae88b9c86020da9e9e4de5e0dd613d6a14a..eab33725a344653b3624ec23f2a1e303faaad2ec 100644 (file)
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -280,14 +280,17 @@ static int cpu_post_load(void *opaque, int version_id)
     for(i = 0; i < 8; i++) {
         env->fptags[i] = (env->fptag_vmstate >> i) & 1;
     }
-    update_fp_status(env);
+    if (tcg_enabled()) {
+        target_ulong dr7;
+        update_fp_status(env);
+        update_mxcsr_status(env);
+
+        cpu_breakpoint_remove_all(cs, BP_CPU);
+        cpu_watchpoint_remove_all(cs, BP_CPU);
 
-    cpu_breakpoint_remove_all(cs, BP_CPU);
-    cpu_watchpoint_remove_all(cs, BP_CPU);
-    {
         /* Indicate all breakpoints disabled, as they are, then
            let the helper re-enable them.  */
-        target_ulong dr7 = env->dr[7];
+        dr7 = env->dr[7];
         env->dr[7] = dr7 & ~(DR7_GLOBAL_BP_MASK | DR7_LOCAL_BP_MASK);
         cpu_x86_update_dr7(env, dr7);
     }