Commit 3889c3fa authored by Peter Maydell's avatar Peter Maydell Committed by Avi Kivity
Browse files

kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq() 



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7ae26bd4

hw/kvm/i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -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_set_irq(kvm_state, irq, level);

    apic_report_irq_delivered(delivered);

}

hw/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -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_set_irq(kvm_state, s->kvm_gsi_base + irq, level);

    apic_report_irq_delivered(delivered);

}

kvm-all.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

    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_set_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_set_irq(s, route->kroute.gsi, 1);

}



int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)

kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,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_set_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);