diff options
author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-08-19 08:48:03 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-10-15 04:15:21 -0400 |
commit | 26815a648e1ec2b338a63a2bc301dcf449b93e5a (patch) | |
tree | 5e91362ff4d522dad277621f1492627ecc8eebe5 | |
parent | ee032c993edd34e0bdf64dab06a55d0e08a4eeb9 (diff) |
KVM: ia64: add a dummy irq ack notification
Before enabling notify_acked_irq for ia64, leave the related APIs as
nop-op first.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | arch/ia64/kvm/irq.h | 32 | ||||
-rw-r--r-- | virt/kvm/ioapic.c | 2 |
2 files changed, 33 insertions, 1 deletions
diff --git a/arch/ia64/kvm/irq.h b/arch/ia64/kvm/irq.h new file mode 100644 index 000000000000..f2e6545debf4 --- /dev/null +++ b/arch/ia64/kvm/irq.h | |||
@@ -0,0 +1,32 @@ | |||
1 | /* | ||
2 | * irq.h: In-kernel interrupt controller related definitions | ||
3 | * Copyright (c) 2008, Intel Corporation. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms and conditions of the GNU General Public License, | ||
7 | * version 2, as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
12 | * more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License along with | ||
15 | * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
16 | * Place - Suite 330, Boston, MA 02111-1307 USA. | ||
17 | * | ||
18 | * Authors: | ||
19 | * Xiantao Zhang <xiantao.zhang@intel.com> | ||
20 | * | ||
21 | */ | ||
22 | |||
23 | #ifndef __IRQ_H | ||
24 | #define __IRQ_H | ||
25 | |||
26 | struct kvm; | ||
27 | |||
28 | static inline void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi) | ||
29 | { | ||
30 | } | ||
31 | |||
32 | #endif | ||
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 515cd7ce761c..53772bb46320 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c | |||
@@ -386,7 +386,7 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len, | |||
386 | break; | 386 | break; |
387 | #ifdef CONFIG_IA64 | 387 | #ifdef CONFIG_IA64 |
388 | case IOAPIC_REG_EOI: | 388 | case IOAPIC_REG_EOI: |
389 | kvm_ioapic_update_eoi(ioapic->kvm, data); | 389 | kvm_ioapic_update_eoi(ioapic->kvm, data, IOAPIC_LEVEL_TRIG); |
390 | break; | 390 | break; |
391 | #endif | 391 | #endif |
392 | 392 | ||