diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2012-07-25 13:41:39 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2012-07-25 13:41:39 +0100 |
commit | e255a5778ddeb76975234c6cf0660ec0a67481eb (patch) | |
tree | 86dd75271a264eea17a525c0a4c71011c030ac66 | |
parent | 461825c0686e72155f80ce0618130742908522d1 (diff) | |
download | qemu-arm-e255a5778ddeb76975234c6cf0660ec0a67481eb.tar.gz |
kvm: Rename kvm_irqchip_set_irq to kvm_inject_async_irq
Rename the function kvm_irqchip_set_irq() to kvm_inject_async_irq(),
since it can be used for asynchronous interrupt injection whether
there is a full irqchip model in the kernel or not.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | hw/kvm/i8259.c | 2 | ||||
-rw-r--r-- | hw/kvm/ioapic.c | 2 | ||||
-rw-r--r-- | kvm-all.c | 6 | ||||
-rw-r--r-- | kvm.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c index 94d1b9aa95..ab970db64a 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_inject_async_irq(kvm_state, irq, level); apic_report_irq_delivered(delivered); } diff --git a/hw/kvm/ioapic.c b/hw/kvm/ioapic.c index 3ae3175403..d7add355e8 100644 --- a/hw/kvm/ioapic.c +++ b/hw/kvm/ioapic.c @@ -82,7 +82,7 @@ static void kvm_ioapic_set_irq(void *opaque, int irq, int level) KVMIOAPICState *s = opaque; int delivered; - delivered = kvm_irqchip_set_irq(kvm_state, s->kvm_gsi_base + irq, level); + delivered = kvm_inject_async_irq(kvm_state, s->kvm_gsi_base + irq, level); apic_report_irq_delivered(delivered); } @@ -853,7 +853,7 @@ static void kvm_handle_interrupt(CPUArchState *env, int mask) } } -int kvm_irqchip_set_irq(KVMState *s, int irq, int level) +int kvm_inject_async_irq(KVMState *s, int irq, int level) { struct kvm_irq_level event; int ret; @@ -864,7 +864,7 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level) event.irq = irq; ret = kvm_vm_ioctl(s, s->irqchip_inject_ioctl, &event); if (ret < 0) { - perror("kvm_set_irqchip_line"); + perror("kvm_inject_async_irq"); abort(); } @@ -1089,7 +1089,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg) assert(route->kroute.type == KVM_IRQ_ROUTING_MSI); - return kvm_irqchip_set_irq(s, route->kroute.gsi, 1); + return kvm_inject_async_irq(s, route->kroute.gsi, 1); } int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) @@ -146,7 +146,7 @@ int kvm_arch_on_sigbus(int code, void *addr); void kvm_arch_init_irq_routing(KVMState *s); -int kvm_irqchip_set_irq(KVMState *s, int irq, int level); +int kvm_inject_async_irq(KVMState *s, int irq, int level); int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg); void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin); |