From patchwork Thu Oct 29 08:22:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 537725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 01A5E140D92 for ; Thu, 29 Oct 2015 19:27:53 +1100 (AEDT) Received: from localhost ([::1]:42622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZriYo-0006aG-ML for incoming@patchwork.ozlabs.org; Thu, 29 Oct 2015 04:27:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZriYH-0005gT-GD for qemu-devel@nongnu.org; Thu, 29 Oct 2015 04:27:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZriYE-0007mQ-5e for qemu-devel@nongnu.org; Thu, 29 Oct 2015 04:27:17 -0400 Received: from mga14.intel.com ([192.55.52.115]:55338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZriYE-0007mD-0R for qemu-devel@nongnu.org; Thu, 29 Oct 2015 04:27:14 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 29 Oct 2015 01:27:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,213,1444719600"; d="scan'208";a="838236219" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by fmsmga002.fm.intel.com with ESMTP; 29 Oct 2015 01:27:12 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Thu, 29 Oct 2015 16:22:07 +0800 Message-Id: <1446106927-15490-3-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446106927-15490-1-git-send-email-liang.z.li@intel.com> References: <1446106927-15490-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Cc: pbonzini@redhat.com, mtosatti@redhat.com, m.gibula@beyond.pl, Liang Li Subject: [Qemu-devel] [RESEND 2/2] Revert "Introduce cpu_clean_all_dirty" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This reverts commit de9d61e83d43be9069e6646fa9d57a3f47779d28. Now 'cpu_clean_all_dirty' is useless, we can revert the related code. Conflicts: include/sysemu/kvm.h --- 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 d2e9e4f..c6a5d0e 100644 --- a/cpus.c +++ b/cpus.c @@ -694,15 +694,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 30ddd12..3d1e5ba 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -11,7 +11,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 461ef65..4ac6176 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -417,7 +417,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 */ @@ -442,13 +441,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, PCIDevice *dev); int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, PCIDevice *dev); diff --git a/kvm-all.c b/kvm-all.c index c442838..1bc1273 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1766,11 +1766,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;