david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq()

Browse Source 
Rename the function kvm_irqchip_set_irq() to kvm_set_irq(),
since it can be used for sending (asynchronous) interrupts whether
there is a full irqchip model in the kernel or not. (We don't
include 'async' in the function name since asynchronous is the
normal case.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Peter Maydell 2012-07-26 15:35:12 +01:00 committed by Avi Kivity
parent 7ae26bd484
commit 3889c3fab1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kvm/i8259.c
View File

@ -94,7 +94,7 @@ static void kvm_pic_set_irq(void *opaque, int irq, int level)
{ {
int delivered; int delivered;
delivered = kvm_irqchip_set_irq(kvm_state, irq, level); delivered = kvm_set_irq(kvm_state, irq, level);
apic_report_irq_delivered(delivered); apic_report_irq_delivered(delivered);
} }

2
hw/kvm/ioapic.c
View File

@ -82,7 +82,7 @@ static void kvm_ioapic_set_irq(void *opaque, int irq, int level)
KVMIOAPICState *s = opaque; KVMIOAPICState *s = opaque;
int delivered; int delivered;
delivered = kvm_irqchip_set_irq(kvm_state, s->kvm_gsi_base + irq, level); delivered = kvm_set_irq(kvm_state, s->kvm_gsi_base + irq, level);
apic_report_irq_delivered(delivered); apic_report_irq_delivered(delivered);
} }

6
kvm-all.c
View File

@ -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_set_irq(KVMState *s, int irq, int level)
{ {
struct kvm_irq_level event; struct kvm_irq_level event;
int ret; int ret;
@ -864,7 +864,7 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level)
event.irq = irq; event.irq = irq;
ret = kvm_vm_ioctl(s, s->irqchip_inject_ioctl, &event); ret = kvm_vm_ioctl(s, s->irqchip_inject_ioctl, &event);
if (ret < 0) { if (ret < 0) {
perror("kvm_set_irqchip_line"); perror("kvm_set_irq");
abort(); abort();
} }
@ -1089,7 +1089,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
assert(route->kroute.type == KVM_IRQ_ROUTING_MSI); assert(route->kroute.type == KVM_IRQ_ROUTING_MSI);
return kvm_irqchip_set_irq(s, route->kroute.gsi, 1); return kvm_set_irq(s, route->kroute.gsi, 1);
} }
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)

2
kvm.h
View File

@ -146,7 +146,7 @@ int kvm_arch_on_sigbus(int code, void *addr);
void kvm_arch_init_irq_routing(KVMState *s); void kvm_arch_init_irq_routing(KVMState *s);
int kvm_irqchip_set_irq(KVMState *s, int irq, int level); int kvm_set_irq(KVMState *s, int irq, int level);
int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg); int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin); void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);