diff options
| author |   Gleb Natapov <gleb@redhat.com> | 2009-09-22 17:51:50 +0300 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-09-23 11:59:54 +0300 |
| commit | 62ffe17b7c8b051c23f1d329a384325ca51217f2 (patch) | |
| tree | b8e01995d480cf56c69691ad4b9e0550db3a2803 /qemu-kvm.c | |
| parent | Don't call kvm_cpu_synchronize_state() if there is no irqchip events to process (diff) | |
| download | qemu-kvm-62ffe17b7c8b051c23f1d329a384325ca51217f2.tar.gz qemu-kvm-62ffe17b7c8b051c23f1d329a384325ca51217f2.tar.bz2 qemu-kvm-62ffe17b7c8b051c23f1d329a384325ca51217f2.zip | |
Update halted state from mpstate only in case of inkernel irq chip
Otherwise cpu is always unhalted by call to kvm_arch_get_registers().
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
| -rw-r--r-- | qemu-kvm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 6511cb6db..2a7fe3dd6 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1605,6 +1605,16 @@ static void on_vcpu(CPUState *env, void (*func)(void *data), void *data) qemu_cond_wait(&qemu_work_cond); } +void kvm_arch_get_registers(CPUState *env) +{ + kvm_arch_save_regs(env); + kvm_arch_save_mpstate(env); +#ifdef KVM_CAP_MP_STATE + if (kvm_irqchip_in_kernel(kvm_context)) + env->halted = (env->mp_state == KVM_MP_STATE_HALTED); +#endif +} + static void do_kvm_cpu_synchronize_state(void *_env) { CPUState *env = _env; |