diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2016-02-29 16:04:44 +0100 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2016-03-03 14:36:18 +0100 |
| commit | 9daa50076f585854f0040aa8403eac020d6f5d64 (patch) | |
| tree | 0989ff6a2ff82271d2f79df0eb7f386944e47461 /arch/x86/kvm | |
| parent | kvm: x86: Convert ioapic->rtc_status.dest_map to a struct (diff) | |
| download | linux-dev-9daa50076f585854f0040aa8403eac020d6f5d64.tar.xz linux-dev-9daa50076f585854f0040aa8403eac020d6f5d64.zip | |
kvm: x86: Track irq vectors in ioapic->rtc_status.dest_map
This allows backtracking later in case the rtc irq has been
moved to another vcpu/vector.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/ioapic.h | 7 | ||||
| -rw-r--r-- | arch/x86/kvm/lapic.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index af729890f6f5..7d2692a49657 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -41,7 +41,14 @@ struct kvm_vcpu; #endif struct dest_map { + /* vcpu bitmap where IRQ has been sent */ DECLARE_BITMAP(map, KVM_MAX_VCPUS); + + /* + * Vector sent to a given vcpu, only valid when + * the vcpu's bit in map is set + */ + u8 vectors[KVM_MAX_VCPUS]; }; diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index e085695e6b5a..d9ae1ce2a6a0 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -914,8 +914,10 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, result = 1; - if (dest_map) + if (dest_map) { __set_bit(vcpu->vcpu_id, dest_map->map); + dest_map->vectors[vcpu->vcpu_id] = vector; + } if (apic_test_vector(vector, apic->regs + APIC_TMR) != !!trig_mode) { if (trig_mode) |