Re: [Qemu-devel] [PATCH 2/6] kvm: Rename kvm_irqchip_set_irq to kvm_inject_async_irq

[Jan Kiszka]

On 2012-07-25 15:24, Peter Maydell wrote:
> 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 <address@hidden>
> ---
>  hw/kvm/i8259.c  |    2 +-
>  hw/kvm/ioapic.c |    2 +-
>  kvm-all.c       |    6 +++---
>  kvm.h           |    2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c
> index 94d1b9a..ab970db 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 3ae3175..d7add35 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);
>  }
>  
> diff --git a/kvm-all.c b/kvm-all.c
> index 3354c6f..9f14274 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -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)
> diff --git a/kvm.h b/kvm.h
> index 00abe36..cfdc95e 100644
> --- a/kvm.h
> +++ b/kvm.h
> @@ -144,7 +144,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);
> 

Acked-by: Jan Kiszka <address@hidden>

-- 
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux