Don't leak kvm_save_mpstate() to main qemu code

It doesn't exist outside x86, and breaks the build.  Move it to
cpu_synchronize_state() instead (only reading, not writing).

Signed-off-by: Avi Kivity <avi@redhat.com>

2 files changed, 1 insertions, 2 deletions

diff --git a/monitor.c b/monitor.c
index 5a9fae642..6ff6e1f2a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -677,7 +677,6 @@ static CPUState *mon_get_cpu(void)
         mon_set_cpu(0);
     }
     cpu_synchronize_state(cur_mon->mon_cpu);
-    kvm_save_mpstate(cur_mon->mon_cpu);
     return cur_mon->mon_cpu;
 }
 
@@ -780,7 +779,6 @@ static void do_info_cpus(Monitor *mon, QObject **ret_data)
         QObject *obj;
 
         cpu_synchronize_state(env);
-        kvm_save_mpstate(env);
 
         obj = qobject_from_jsonf("{ 'CPU': %d, 'current': %i, 'halted': %i }",
                                  env->cpu_index, env == mon->mon_cpu,
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 7b7bc0f43..82e362cce 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -1217,6 +1217,7 @@ void kvm_arch_save_regs(CPUState *env)
                 return;
         }
     }
+    kvm_arch_save_mpstate(env);
 }
 
 static void do_cpuid_ent(struct kvm_cpuid_entry2 *e, uint32_t function,