From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: James Hogan <james.hogan@imgtec.com>,
Gleb Natapov <gleb@redhat.com>,
Aurelien Jarno <aurelien@aurel32.net>
Subject: [Qemu-devel] [PULL 09/14] target-mips: Call kvm_mips_reset_vcpu() from mips_cpu_reset()
Date: Fri, 20 Jun 2014 14:11:18 +0200 [thread overview]
Message-ID: <1403266283-1517-10-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1403266283-1517-1-git-send-email-pbonzini@redhat.com>
From: James Hogan <james.hogan@imgtec.com>
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 <james.hogan@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
next prev parent reply other threads:[~2014-06-20 12:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 12:11 [Qemu-devel] [PULL 00/14] Pending KVM patches for 2.1 Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 01/14] KVM: Fix GSI number space limit Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 02/14] target-mips: Reset CPU timer consistently Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 03/14] hw/mips/cputimer: Don't start periodic timer in KVM mode Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 04/14] hw/mips: Add API to convert KVM guest KSEG0 <-> GPA Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 05/14] target-mips: get_physical_address: Add defines for segment bases Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 06/14] target-mips: get_physical_address: Add KVM awareness Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 07/14] kvm: Allow arch to set sigmask length Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 08/14] target-mips: kvm: Add main KVM support for MIPS Paolo Bonzini
2014-06-20 12:11 ` Paolo Bonzini [this message]
2014-06-20 12:11 ` [Qemu-devel] [PULL 10/14] hw/mips: In KVM mode, inject IRQ2 (I/O) interrupts via ioctls Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 11/14] hw/mips: malta: Add KVM support Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 12/14] target-mips: Enable KVM support in build system Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 13/14] MAINTAINERS: Add entry for MIPS KVM Paolo Bonzini
2014-06-20 12:11 ` [Qemu-devel] [PULL 14/14] hw/mips: malta: Don't boot from flash with KVM T&E Paolo Bonzini
2014-06-20 19:01 ` [Qemu-devel] [PULL 00/14] Pending KVM patches for 2.1 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403266283-1517-10-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=aurelien@aurel32.net \
--cc=gleb@redhat.com \
--cc=james.hogan@imgtec.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).