[Qemu-devel] [patch 2/3] Introduce cpu_clean_all_dirty

[Marcelo Tosatti]

Introduce cpu_clean_all_dirty, to force subsequent cpu_synchronize_all_states
to read in-kernel register state.

Cc: qemu-sta...@nongnu.org
Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>

---
 cpus.c                |    9 +++++++++
 include/sysemu/cpus.h |    1 +
 include/sysemu/kvm.h  |    8 ++++++++
 kvm-all.c             |    5 +++++
 4 files changed, 23 insertions(+)

Index: qemu/cpus.c
===================================================================
--- qemu.orig/cpus.c    2014-09-04 15:38:03.304783188 -0300
+++ qemu/cpus.c 2014-09-04 15:38:31.643709731 -0300
@@ -589,6 +589,15 @@
     }
 }
 
+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;
Index: qemu/include/sysemu/cpus.h
===================================================================
--- qemu.orig/include/sysemu/cpus.h     2014-08-22 18:04:23.129789186 -0300
+++ qemu/include/sysemu/cpus.h  2014-09-04 15:38:31.710709558 -0300
@@ -10,6 +10,7 @@
 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);
 
Index: qemu/include/sysemu/kvm.h
===================================================================
--- qemu.orig/include/sysemu/kvm.h      2014-08-22 18:04:23.129789186 -0300
+++ qemu/include/sysemu/kvm.h   2014-09-04 15:38:31.722709526 -0300
@@ -348,6 +348,7 @@
 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_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);
Index: qemu/kvm-all.c
===================================================================
--- qemu.orig/kvm-all.c 2014-09-04 15:38:03.338783100 -0300
+++ qemu/kvm-all.c      2014-09-04 15:38:31.722709526 -0300
@@ -1695,6 +1695,11 @@
     run_on_cpu(cpu, do_kvm_cpu_synchronize_post_init, cpu);
 }
 
+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;