[Qemu-devel] [PATCH uq/master] kvm: Rename irqchip_inject_ioctl to irq_set_ioctl

[Qemu-devel] [PATCH uq/master] kvm: Rename irqchip_inject_ioctl to irq_set_ioctl

[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 <jan.kiszka@siemens.com>
---
 kvm-all.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index d1924db..d4d8a1f 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -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);
-- 
1.7.3.4

Re: [Qemu-devel] [PATCH uq/master] kvm: Rename irqchip_inject_ioctl to irq_set_ioctl

[Peter Maydell]

On 24 August 2012 12:34, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> 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 <jan.kiszka@siemens.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

Re: [Qemu-devel] [PATCH uq/master] kvm: Rename irqchip_inject_ioctl to irq_set_ioctl

[Marcelo Tosatti]

On Fri, Aug 24, 2012 at 01:34:47PM +0200, Jan Kiszka wrote:
> 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 <jan.kiszka@siemens.com>
> ---
>  kvm-all.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.