summaryrefslogtreecommitdiff
path: root/target-mips/translate.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-06-20 19:25:17 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-06-20 19:25:18 +0100
commitd70a319b8d6f10ad895f05bdd5160cdb42f5058a (patch)
treeb2d0d547bb67a573422ccf509c1e95ba01430dde /target-mips/translate.c
parent0a99aae5fab5ed260aab96049c274b0334eb4085 (diff)
parent3c5d0be553b18d47361ac3a701e2bff86b8256b0 (diff)
downloadqemu-d70a319b8d6f10ad895f05bdd5160cdb42f5058a.tar.gz
Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
* remotes/kvm/uq/master: hw/mips: malta: Don't boot from flash with KVM T&E MAINTAINERS: Add entry for MIPS KVM target-mips: Enable KVM support in build system hw/mips: malta: Add KVM support hw/mips: In KVM mode, inject IRQ2 (I/O) interrupts via ioctls target-mips: Call kvm_mips_reset_vcpu() from mips_cpu_reset() target-mips: kvm: Add main KVM support for MIPS kvm: Allow arch to set sigmask length target-mips: get_physical_address: Add KVM awareness target-mips: get_physical_address: Add defines for segment bases hw/mips: Add API to convert KVM guest KSEG0 <-> GPA hw/mips/cputimer: Don't start periodic timer in KVM mode target-mips: Reset CPU timer consistently KVM: Fix GSI number space limit Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-mips/translate.c')
-rw-r--r--target-mips/translate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 2b3befb0b4..1b2bf7f790 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -16092,6 +16092,8 @@ void cpu_state_reset(CPUMIPSState *env)
/* Count register increments in debug mode, EJTAG version 1 */
env->CP0_Debug = (1 << CP0DB_CNT) | (0x1 << CP0DB_VER);
+ cpu_mips_store_count(env, 1);
+
if (env->CP0_Config3 & (1 << CP0C3_MT)) {
int i;