Merge commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44' into upstream-merge

* commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44':
  kvm: Simplify cpu_synchronize_state()

Conflicts:
	hw/apic.c
	target-i386/machine.c

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

1 files changed, 3 insertions, 5 deletions

diff --git a/kvm.h b/kvm.h
index cca8b3da0..5f7029901 100644
--- a/kvm.h
+++ b/kvm.h
@@ -131,16 +131,14 @@ int kvm_check_extension(KVMState *s, unsigned int extension);
 
 uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
                                       int reg);
+void kvm_cpu_synchronize_state(CPUState *env);
 
 /* generic hooks - to be moved/refactored once there are more users */
 
-static inline void cpu_synchronize_state(CPUState *env, int modified)
+static inline void cpu_synchronize_state(CPUState *env)
 {
     if (kvm_enabled()) {
-        if (modified)
-            kvm_arch_put_registers(env);
-        else
-            kvm_arch_get_registers(env);
+        kvm_cpu_synchronize_state(env);
     }
 }