lkml.org 
[lkml]   [2016]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 10/14] KVM: pass struct kvm to kvm_set_routing_entry
    Date
    Arch-specific code will use it.

    Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
    ---
    arch/powerpc/kvm/mpic.c | 3 ++-
    arch/s390/kvm/interrupt.c | 3 ++-
    arch/x86/kvm/irq_comm.c | 3 ++-
    include/linux/kvm_host.h | 3 ++-
    virt/kvm/irqchip.c | 7 ++++---
    5 files changed, 12 insertions(+), 7 deletions(-)

    diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
    index 6249cdc834d1..ed38f8114118 100644
    --- a/arch/powerpc/kvm/mpic.c
    +++ b/arch/powerpc/kvm/mpic.c
    @@ -1823,7 +1823,8 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
    return 0;
    }

    -int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
    +int kvm_set_routing_entry(struct kvm *kvm,
    + struct kvm_kernel_irq_routing_entry *e,
    const struct kvm_irq_routing_entry *ue)
    {
    int r = -EINVAL;
    diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
    index ca19627779db..24524c0f3ef8 100644
    --- a/arch/s390/kvm/interrupt.c
    +++ b/arch/s390/kvm/interrupt.c
    @@ -2246,7 +2246,8 @@ static int set_adapter_int(struct kvm_kernel_irq_routing_entry *e,
    return ret;
    }

    -int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
    +int kvm_set_routing_entry(struct kvm *kvm,
    + struct kvm_kernel_irq_routing_entry *e,
    const struct kvm_irq_routing_entry *ue)
    {
    int ret;
    diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
    index 47ad681a33fd..889563d50c55 100644
    --- a/arch/x86/kvm/irq_comm.c
    +++ b/arch/x86/kvm/irq_comm.c
    @@ -248,7 +248,8 @@ static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,
    return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);
    }

    -int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
    +int kvm_set_routing_entry(struct kvm *kvm,
    + struct kvm_kernel_irq_routing_entry *e,
    const struct kvm_irq_routing_entry *ue)
    {
    int r = -EINVAL;
    diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
    index 66b2f6159aad..60d339faa94c 100644
    --- a/include/linux/kvm_host.h
    +++ b/include/linux/kvm_host.h
    @@ -1011,7 +1011,8 @@ int kvm_set_irq_routing(struct kvm *kvm,
    const struct kvm_irq_routing_entry *entries,
    unsigned nr,
    unsigned flags);
    -int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
    +int kvm_set_routing_entry(struct kvm *kvm,
    + struct kvm_kernel_irq_routing_entry *e,
    const struct kvm_irq_routing_entry *ue);
    void kvm_free_irq_routing(struct kvm *kvm);

    diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
    index 8db197bb6c7a..df99e9c3b64d 100644
    --- a/virt/kvm/irqchip.c
    +++ b/virt/kvm/irqchip.c
    @@ -135,7 +135,8 @@ void kvm_free_irq_routing(struct kvm *kvm)
    free_irq_routing_table(rt);
    }

    -static int setup_routing_entry(struct kvm_irq_routing_table *rt,
    +static int setup_routing_entry(struct kvm *kvm,
    + struct kvm_irq_routing_table *rt,
    struct kvm_kernel_irq_routing_entry *e,
    const struct kvm_irq_routing_entry *ue)
    {
    @@ -154,7 +155,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt,

    e->gsi = ue->gsi;
    e->type = ue->type;
    - r = kvm_set_routing_entry(e, ue);
    + r = kvm_set_routing_entry(kvm, e, ue);
    if (r)
    goto out;
    if (e->type == KVM_IRQ_ROUTING_IRQCHIP)
    @@ -211,7 +212,7 @@ int kvm_set_irq_routing(struct kvm *kvm,
    kfree(e);
    goto out;
    }
    - r = setup_routing_entry(new, e, ue);
    + r = setup_routing_entry(kvm, new, e, ue);
    if (r) {
    kfree(e);
    goto out;
    --
    2.9.0
    \
     
     \ /
      Last update: 2016-07-12 22:21    [W:3.862 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site