From a9ed61533f0590a3d024145d59dddc031ee86396 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Fri, 5 Sep 2014 10:52:46 -0300 Subject: [PATCH] Introduce cpu_clean_all_dirty Introduce cpu_clean_all_dirty, to force subsequent cpu_synchronize_all_states to read in-kernel register state. Cc: qemu-stable@nongnu.org Signed-off-by: Marcelo Tosatti Signed-off-by: Paolo Bonzini (cherry picked from commit de9d61e83d43be9069e6646fa9d57a3f47779d28) Conflicts: kvm-all.c *removed context dependency on kvm_cpu_synchronize_post_init Signed-off-by: Michael Roth --- cpus.c | 9 +++++++++ include/sysemu/cpus.h | 1 + include/sysemu/kvm.h | 8 ++++++++ kvm-all.c | 5 +++++ 4 files changed, 23 insertions(+) diff --git a/cpus.c b/cpus.c index 5e7f2cf3cfcd..492defee6ad7 100644 --- a/cpus.c +++ b/cpus.c @@ -523,6 +523,15 @@ void cpu_synchronize_all_post_init(void) } } +void cpu_clean_all_dirty(void) +{ + CPUState *cpu; + + CPU_FOREACH(cpu) { + cpu_clean_state(cpu); + } +} + static int do_vm_stop(RunState state) { int ret = 0; diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 4f790810bfea..3f162a9e083c 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -10,6 +10,7 @@ void cpu_stop_current(void); void cpu_synchronize_all_states(void); void cpu_synchronize_all_post_reset(void); void cpu_synchronize_all_post_init(void); +void cpu_clean_all_dirty(void); void qtest_clock_warp(int64_t dest); diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 174ea36afad8..777dc66c8235 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -348,6 +348,7 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, void kvm_cpu_synchronize_state(CPUState *cpu); void kvm_cpu_synchronize_post_reset(CPUState *cpu); void kvm_cpu_synchronize_post_init(CPUState *cpu); +void kvm_cpu_clean_state(CPUState *cpu); /* generic hooks - to be moved/refactored once there are more users */ @@ -372,6 +373,13 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) } } +static inline void cpu_clean_state(CPUState *cpu) +{ + if (kvm_enabled()) { + kvm_cpu_clean_state(cpu); + } +} + int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg); int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg); void kvm_irqchip_release_virq(KVMState *s, int virq); diff --git a/kvm-all.c b/kvm-all.c index 1402f4f42949..40f6b55ffa2f 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1681,6 +1681,11 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) cpu->kvm_vcpu_dirty = false; } +void kvm_cpu_clean_state(CPUState *cpu) +{ + cpu->kvm_vcpu_dirty = false; +} + int kvm_cpu_exec(CPUState *cpu) { struct kvm_run *run = cpu->kvm_run;