kvm: Rename irqchip_inject_ioctl to irq_set_ioctl
PATCH 1/1 kvm: Rename irqchip_inject_ioctl to irq_set_ioctl
This variable is no longer bound to irqchip, and the IOCTL sets the IRQ level, does not directly inject it. No functional changes.
Signed-off-by Jan Kiszka <[email protected]>
--- kvm-all.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
kvm-all.c +5 -5
@@ -91,7 +91,7 @@ struct KVMState/* The man page (and posix) say ioctl numbers are signed int, but * they're not. Linux, glibc and *BSD all treat ioctl numbers as * unsigned, and treating them as signed here can break things */ -unsigned irqchip_inject_ioctl; +unsigned irq_set_ioctl;#ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *irq_routes;int nr_allocated_irq_routes;
@@ -869,13 +869,13 @@ int kvm_set_irq(KVMState *s, int irq, int level) event.level = level; 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 ) {perror ("kvm_set_irq" );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
@@ -1340,9 +1340,9 @@ int kvm_init(void) s->direct_msi = (kvm_check_extension (s,KVM_CAP_SIGNAL_MSI ) >0 );#endif - s->irqchip_inject_ioctl =KVM_IRQ_LINE ; + s->irq_set_ioctl =KVM_IRQ_LINE ;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);
Signature · 1 line
1.7.3.4
Quoted 4 lines · Jan Kiszka
This variable is no longer bound to irqchip, and the IOCTL sets the IRQ level, does not directly inject it. No functional changes.
Signed-off-by Jan Kiszka <[email protected]>
Reviewed-by Peter Maydell <[email protected]>
-- PMM
Marcelo Tosatti
AppliedQuoted 7 lines · Jan Kiszka
This variable is no longer bound to irqchip, and the IOCTL sets the IRQ level, does not directly inject it. No functional changes.
Signed-off-by Jan Kiszka <[email protected]>--- kvm-all.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
Applied, thanks.