From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZU7B8-00056S-2n for qemu-devel@nongnu.org; Tue, 25 Aug 2015 01:53:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZU7B5-00020V-LS for qemu-devel@nongnu.org; Tue, 25 Aug 2015 01:53:50 -0400 Received: from mga11.intel.com ([192.55.52.93]:22764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZU7B5-0001yr-G4 for qemu-devel@nongnu.org; Tue, 25 Aug 2015 01:53:47 -0400 From: Liang Li Date: Tue, 25 Aug 2015 13:52:45 +0800 Message-Id: <1440481965-12318-3-git-send-email-liang.z.li@intel.com> In-Reply-To: <1440481965-12318-1-git-send-email-liang.z.li@intel.com> References: <1440481965-12318-1-git-send-email-liang.z.li@intel.com> Subject: [Qemu-devel] [RFC 2/2] Revert "Introduce cpu_clean_all_dirty" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, m.gibula@beyond.pl, Liang Li This reverts commit de9d61e83d43be9069e6646fa9d57a3f47779d28. --- cpus.c | 9 --------- include/sysemu/cpus.h | 1 - include/sysemu/kvm.h | 8 -------- kvm-all.c | 5 ----- 4 files changed, 23 deletions(-) diff --git a/cpus.c b/cpus.c index cd5abef..ffa81cb 100644 --- a/cpus.c +++ b/cpus.c @@ -616,15 +616,6 @@ 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 3f162a9..4f79081 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -10,7 +10,6 @@ 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 983e99e..083fca6 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -380,7 +380,6 @@ 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 */ @@ -405,13 +404,6 @@ 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 06e06f2..f4df584 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1779,11 +1779,6 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) 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; -- 1.9.1