projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ca9fd5
)
KVM: PIT: take inject_pending into account when emulating hlt
author
Marcelo Tosatti
<mtosatti@redhat.com>
Tue, 6 May 2008 16:32:54 +0000
(13:32 -0300)
committer
Avi Kivity
<avi@qumranet.com>
Sun, 18 May 2008 11:34:15 +0000
(14:34 +0300)
Otherwise hlt emulation fails if PIT is not injecting IRQ's.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
arch/x86/kvm/i8254.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/i8254.c
b/arch/x86/kvm/i8254.c
index
3324d90
..
7c077a9
100644
(file)
--- a/
arch/x86/kvm/i8254.c
+++ b/
arch/x86/kvm/i8254.c
@@
-216,7
+216,7
@@
int pit_has_pending_timer(struct kvm_vcpu *vcpu)
{
struct kvm_pit *pit = vcpu->kvm->arch.vpit;
- if (pit && vcpu->vcpu_id == 0)
+ if (pit && vcpu->vcpu_id == 0
&& pit->pit_state.inject_pending
)
return atomic_read(&pit->pit_state.pit_timer.pending);
return 0;