mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvm: Rename irqchip_inject_ioctl to irq_set_ioctl

Browse Source 
This variable is no longer bound to irqchip, and the IOCTL sets the IRQ
level, does not directly inject it. No functional changes.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2012-08-24 13:34:47 +02:00 committed by Marcelo Tosatti
parent 683d4b5d9f
commit e333cd6949
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kvm-all.c
View File

@ -92,7 +92,7 @@ struct KVMState
/* The man page (and posix) say ioctl numbers are signed int, but /* The man page (and posix) say ioctl numbers are signed int, but
* they're not. Linux, glibc and *BSD all treat ioctl numbers as * they're not. Linux, glibc and *BSD all treat ioctl numbers as
* unsigned, and treating them as signed here can break things */ * unsigned, and treating them as signed here can break things */
unsigned irqchip_inject_ioctl; unsigned irq_set_ioctl;
#ifdef KVM_CAP_IRQ_ROUTING #ifdef KVM_CAP_IRQ_ROUTING
struct kvm_irq_routing *irq_routes; struct kvm_irq_routing *irq_routes;
int nr_allocated_irq_routes; int nr_allocated_irq_routes;
@ -870,13 +870,13 @@ int kvm_set_irq(KVMState *s, int irq, int level)
event.level = level; event.level = level;
event.irq = irq; event.irq = irq;
ret = kvm_vm_ioctl(s, s->irqchip_inject_ioctl, &event); ret = kvm_vm_ioctl(s, s->irq_set_ioctl, &event);
if (ret < 0) { if (ret < 0) {
perror("kvm_set_irq"); perror("kvm_set_irq");
abort(); abort();
} }
return (s->irqchip_inject_ioctl == KVM_IRQ_LINE) ? 1 : event.status; return (s->irq_set_ioctl == KVM_IRQ_LINE) ? 1 : event.status;
} }
#ifdef KVM_CAP_IRQ_ROUTING #ifdef KVM_CAP_IRQ_ROUTING
@ -1385,9 +1385,9 @@ int kvm_init(void)
s->intx_set_mask = kvm_check_extension(s, KVM_CAP_PCI_2_3); s->intx_set_mask = kvm_check_extension(s, KVM_CAP_PCI_2_3);
s->irqchip_inject_ioctl = KVM_IRQ_LINE; s->irq_set_ioctl = KVM_IRQ_LINE;
if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) { if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS; s->irq_set_ioctl = KVM_IRQ_LINE_STATUS;
} }
ret = kvm_arch_init(s); ret = kvm_arch_init(s);