diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-13 09:25:48 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-13 09:25:48 -0500 |
| commit | d517872ec289f5bfa6bd9f385a90e09483e9949c (patch) | |
| tree | da187195eaa2e0c9c6102f5afa3435d4ab1ffd3f /hw/kvm/i8259.c | |
| parent | 33e95c6328a3149a52615176617997c4f8f7088b (diff) | |
| parent | 96fda35ac477e954eee989d6a3ae9e686cc361d6 (diff) | |
| download | focaccia-qemu-d517872ec289f5bfa6bd9f385a90e09483e9949c.tar.gz focaccia-qemu-d517872ec289f5bfa6bd9f385a90e09483e9949c.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master: kvm: Add documentation comment for kvm_irqchip_in_kernel() kvm: Decouple 'GSI routing' from 'kernel irqchip' kvm: Decouple 'MSI routing via irqfds' from 'kernel irqchip' kvm: Decouple 'irqfds usable' from 'kernel irqchip' kvm: Move kvm_allows_irq0_override() to target-i386, fix return type kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq() kvm: Decouple 'async interrupt delivery' from 'kernel irqchip' configure: Don't implicitly hardcode list of KVM architectures kvm: Check if smp_cpus exceeds max cpus supported by kvm
Diffstat (limited to 'hw/kvm/i8259.c')
| -rw-r--r-- | hw/kvm/i8259.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c index 94d1b9aa95..1e24cd4f36 100644 --- a/hw/kvm/i8259.c +++ b/hw/kvm/i8259.c @@ -94,7 +94,7 @@ static void kvm_pic_set_irq(void *opaque, int irq, int level) { int delivered; - delivered = kvm_irqchip_set_irq(kvm_state, irq, level); + delivered = kvm_set_irq(kvm_state, irq, level); apic_report_irq_delivered(delivered); } |