diff options
| author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-10-16 09:58:15 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-28 13:22:14 +0100 |
| commit | decc90162a99b4e51c534ab63f9b6fc5cb0f2596 (patch) | |
| tree | 61f590370e93a3f0ed34881c2c7a954ce1c21b57 /arch/ia64/include | |
| parent | KVM: Fix guest shared interrupt with in-kernel irqchip (diff) | |
| download | linux-decc90162a99b4e51c534ab63f9b6fc5cb0f2596.tar.xz linux-decc90162a99b4e51c534ab63f9b6fc5cb0f2596.zip | |
KVM: ia64: Fix halt emulation logic
Common halt logic was changed by x86 and did not update ia64. This patch
updates halt for ia64.
Fixes a regression causing guests to hang with more than 2 vcpus.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/ia64/include')
| -rw-r--r-- | arch/ia64/include/asm/kvm_host.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h index 04c0b88f7b3a..c60d324da540 100644 --- a/arch/ia64/include/asm/kvm_host.h +++ b/arch/ia64/include/asm/kvm_host.h @@ -365,7 +365,8 @@ struct kvm_vcpu_arch { long itc_offset; unsigned long itc_check; unsigned long timer_check; - unsigned long timer_pending; + unsigned int timer_pending; + unsigned int timer_fired; unsigned long vrr[8]; unsigned long ibr[8]; |