diff options
author | Gleb Natapov <gleb@redhat.com> | 2009-03-05 09:34:44 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:26 -0400 |
commit | 6da7e3f643cf7099965d75fda8606b9d3a8650b9 (patch) | |
tree | af1ae2e8e3cca59c127d252b3f84efda1dfadc5d /arch/ia64/kvm/kvm-ia64.c | |
parent | f5a1e9f89504f57b2b45645a7239dc8a8ddb0f4c (diff) |
KVM: APIC: kvm_apic_set_irq deliver all kinds of interrupts
Get rid of ioapic_inj_irq() and ioapic_inj_nmi() functions.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 774f0d78a581..99d6d174d932 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -292,13 +292,13 @@ static void vcpu_deliver_ipi(struct kvm_vcpu *vcpu, uint64_t dm, | |||
292 | { | 292 | { |
293 | switch (dm) { | 293 | switch (dm) { |
294 | case SAPIC_FIXED: | 294 | case SAPIC_FIXED: |
295 | kvm_apic_set_irq(vcpu, vector, 0); | 295 | kvm_apic_set_irq(vcpu, vector, dm, 0); |
296 | break; | 296 | break; |
297 | case SAPIC_NMI: | 297 | case SAPIC_NMI: |
298 | kvm_apic_set_irq(vcpu, 2, 0); | 298 | kvm_apic_set_irq(vcpu, 2, dm, 0); |
299 | break; | 299 | break; |
300 | case SAPIC_EXTINT: | 300 | case SAPIC_EXTINT: |
301 | kvm_apic_set_irq(vcpu, 0, 0); | 301 | kvm_apic_set_irq(vcpu, 0, dm, 0); |
302 | break; | 302 | break; |
303 | case SAPIC_INIT: | 303 | case SAPIC_INIT: |
304 | case SAPIC_PMI: | 304 | case SAPIC_PMI: |
@@ -1813,7 +1813,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) | |||
1813 | put_cpu(); | 1813 | put_cpu(); |
1814 | } | 1814 | } |
1815 | 1815 | ||
1816 | int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 trig) | 1816 | int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 dmode, u8 trig) |
1817 | { | 1817 | { |
1818 | 1818 | ||
1819 | struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd); | 1819 | struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd); |