diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-11-24 14:53:58 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-11-24 14:56:44 +0200 |
| commit | b55b5fad767f8ab24c74ac16ddccca8990d2ead4 (patch) | |
| tree | c94ca8ac629b81050ed706e640a6ba5cde07c87c /qemu-kvm-x86.c | |
| parent | Merge commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57' into upstream-merge (diff) | |
| download | qemu-kvm-b55b5fad767f8ab24c74ac16ddccca8990d2ead4.tar.gz qemu-kvm-b55b5fad767f8ab24c74ac16ddccca8990d2ead4.tar.bz2 qemu-kvm-b55b5fad767f8ab24c74ac16ddccca8990d2ead4.zip | |
Fix mismerge of irq bitmap refactoring
init/reset was left out.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm-x86.c')
| -rw-r--r-- | qemu-kvm-x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 71a6319e0..1f0d37a75 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -1291,6 +1291,7 @@ int kvm_arch_init_vcpu(CPUState *cenv) qemu_kvm_load_lapic(cenv); + cenv->interrupt_injected = -1; #ifdef KVM_CPUID_SIGNATURE /* Paravirtualization CPUIDs */ @@ -1452,6 +1453,7 @@ void kvm_arch_push_nmi(void *opaque) void kvm_arch_cpu_reset(CPUState *env) { + env->interrupt_injected = -1; kvm_arch_load_regs(env); if (!cpu_is_bsp(env)) { if (kvm_irqchip_in_kernel()) { |