diff options
author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-10-16 03:58:15 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2008-10-28 08:22:14 -0400 |
commit | decc90162a99b4e51c534ab63f9b6fc5cb0f2596 (patch) | |
tree | 61f590370e93a3f0ed34881c2c7a954ce1c21b57 /arch/ia64/include/asm/kvm_host.h | |
parent | 5550af4df179e52753d3a43a788a113ad8cd95cd (diff) |
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/asm/kvm_host.h')
-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 { | |||
365 | long itc_offset; | 365 | long itc_offset; |
366 | unsigned long itc_check; | 366 | unsigned long itc_check; |
367 | unsigned long timer_check; | 367 | unsigned long timer_check; |
368 | unsigned long timer_pending; | 368 | unsigned int timer_pending; |
369 | unsigned int timer_fired; | ||
369 | 370 | ||
370 | unsigned long vrr[8]; | 371 | unsigned long vrr[8]; |
371 | unsigned long ibr[8]; | 372 | unsigned long ibr[8]; |