[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] hw/mips/cputimer: Don't start periodic timer i
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/14] hw/mips/cputimer: Don't start periodic timer in KVM mode |
Date: |
Fri, 20 Jun 2014 14:11:12 +0200 |
From: Sanjay Lal <address@hidden>
Compare/Count timer interrupts are handled in-kernel for KVM. Therefore
don't bother creating the timer at init time if KVM is enabled. This
will conveniently avoid attempts to set the timeout when
cpu_mips_store_count() is called at reset with KVM enabled, treating the
timer as stopped so that CP0_Count is modified directly.
Signed-off-by: Sanjay Lal <address@hidden>
address@hidden: Update after "target-mips: Reset CPU timer
consistently" which moves timer start to reset time]
Signed-off-by: James Hogan <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/mips/cputimer.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/hw/mips/cputimer.c b/hw/mips/cputimer.c
index 6900a74..577c9ae 100644
--- a/hw/mips/cputimer.c
+++ b/hw/mips/cputimer.c
@@ -23,6 +23,7 @@
#include "hw/hw.h"
#include "hw/mips/cpudevs.h"
#include "qemu/timer.h"
+#include "sysemu/kvm.h"
#define TIMER_FREQ 100 * 1000 * 1000
@@ -146,5 +147,11 @@ static void mips_timer_cb (void *opaque)
void cpu_mips_clock_init (CPUMIPSState *env)
{
- env->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &mips_timer_cb, env);
+ /*
+ * If we're in KVM mode, don't create the periodic timer, that is handled
in
+ * kernel.
+ */
+ if (!kvm_enabled()) {
+ env->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &mips_timer_cb, env);
+ }
}
--
1.7.1
- [Qemu-devel] [PULL 00/14] Pending KVM patches for 2.1, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 01/14] KVM: Fix GSI number space limit, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 03/14] hw/mips/cputimer: Don't start periodic timer in KVM mode,
Paolo Bonzini <=
- [Qemu-devel] [PULL 02/14] target-mips: Reset CPU timer consistently, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 04/14] hw/mips: Add API to convert KVM guest KSEG0 <-> GPA, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 05/14] target-mips: get_physical_address: Add defines for segment bases, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 06/14] target-mips: get_physical_address: Add KVM awareness, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 07/14] kvm: Allow arch to set sigmask length, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 08/14] target-mips: kvm: Add main KVM support for MIPS, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 09/14] target-mips: Call kvm_mips_reset_vcpu() from mips_cpu_reset(), Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 10/14] hw/mips: In KVM mode, inject IRQ2 (I/O) interrupts via ioctls, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 11/14] hw/mips: malta: Add KVM support, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 12/14] target-mips: Enable KVM support in build system, Paolo Bonzini, 2014/06/20