From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxxfc-0008I0-A3 for qemu-devel@nongnu.org; Fri, 20 Jun 2014 08:11:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxxfX-0002Gs-2q for qemu-devel@nongnu.org; Fri, 20 Jun 2014 08:11:52 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:63555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxxfW-0002GT-TH for qemu-devel@nongnu.org; Fri, 20 Jun 2014 08:11:47 -0400 Received: by mail-wi0-f171.google.com with SMTP id n15so679309wiw.16 for ; Fri, 20 Jun 2014 05:11:46 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 20 Jun 2014 14:11:18 +0200 Message-Id: <1403266283-1517-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403266283-1517-1-git-send-email-pbonzini@redhat.com> References: <1403266283-1517-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 09/14] target-mips: Call kvm_mips_reset_vcpu() from mips_cpu_reset() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: James Hogan , Gleb Natapov , Aurelien Jarno From: James Hogan When KVM is enabled call kvm_mips_reset_vcpu() from mips_cpu_reset() as done for other targets since commit 50a2c6e55fa2 (kvm: reset state from the CPU's reset method). Signed-off-by: James Hogan Cc: Aurelien Jarno Cc: Paolo Bonzini Cc: Gleb Natapov Signed-off-by: Paolo Bonzini --- target-mips/cpu.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/target-mips/cpu.c b/target-mips/cpu.c index dd954fc..b3e0e6c 100644 --- a/target-mips/cpu.c +++ b/target-mips/cpu.c @@ -19,7 +19,9 @@ */ #include "cpu.h" +#include "kvm_mips.h" #include "qemu-common.h" +#include "sysemu/kvm.h" static void mips_cpu_set_pc(CPUState *cs, vaddr value) @@ -87,6 +89,12 @@ static void mips_cpu_reset(CPUState *s) tlb_flush(s, 1); cpu_state_reset(env); + +#ifndef CONFIG_USER_ONLY + if (kvm_enabled()) { + kvm_mips_reset_vcpu(cpu); + } +#endif } static void mips_cpu_realizefn(DeviceState *dev, Error **errp) -- 1.7.1