Patchwork kvm/openpic: add kvm_irqchip_commit_routes

login
register
mail settings
Submitter Scott Wood
Date June 12, 2013, 9:21 p.m.
Message ID <1371072105-28397-1-git-send-email-scottwood@freescale.com>
Download mbox | patch
Permalink /patch/250884/
State New
Headers show

Comments

Scott Wood - June 12, 2013, 9:21 p.m.
The patch that added kvm_irqchip_commit_routes was originally
meant to come after the in-kernel mpic patch, and thus it updated
hw/intc/openpic_kvm.c.  However, it was applied before the in-kernel
mpic patch (which creates hw/intc/openpic_kvm.c), and thus this hunk
got lost.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
 hw/intc/openpic_kvm.c |    2 ++
 1 file changed, 2 insertions(+)
Alexander Graf - June 12, 2013, 9:23 p.m.
On 12.06.2013, at 23:21, Scott Wood wrote:

> The patch that added kvm_irqchip_commit_routes was originally
> meant to come after the in-kernel mpic patch, and thus it updated
> hw/intc/openpic_kvm.c.  However, it was applied before the in-kernel
> mpic patch (which creates hw/intc/openpic_kvm.c), and thus this hunk
> got lost.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>

I'll squash this in with your previous commit if you're ok with that.


Alex

> ---
> hw/intc/openpic_kvm.c |    2 ++
> 1 file changed, 2 insertions(+)
> 
> diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
> index 809b34b..17d0a35 100644
> --- a/hw/intc/openpic_kvm.c
> +++ b/hw/intc/openpic_kvm.c
> @@ -204,6 +204,8 @@ static int kvm_openpic_init(SysBusDevice *dev)
>     kvm_msi_via_irqfd_allowed = true;
>     kvm_gsi_routing_allowed = true;
> 
> +    kvm_irqchip_commit_routes(s);
> +
>     return 0;
> }
> 
> -- 
> 1.7.10.4
> 
>
Scott Wood - June 12, 2013, 9:25 p.m.
On 06/12/2013 04:23:09 PM, Alexander Graf wrote:
> 
> On 12.06.2013, at 23:21, Scott Wood wrote:
> 
> > The patch that added kvm_irqchip_commit_routes was originally
> > meant to come after the in-kernel mpic patch, and thus it updated
> > hw/intc/openpic_kvm.c.  However, it was applied before the in-kernel
> > mpic patch (which creates hw/intc/openpic_kvm.c), and thus this hunk
> > got lost.
> >
> > Signed-off-by: Scott Wood <scottwood@freescale.com>
> 
> I'll squash this in with your previous commit if you're ok with that.

That's fine.

-Scott
Alexander Graf - June 12, 2013, 9:26 p.m.
On 12.06.2013, at 23:25, Scott Wood wrote:

> On 06/12/2013 04:23:09 PM, Alexander Graf wrote:
>> On 12.06.2013, at 23:21, Scott Wood wrote:
>> > The patch that added kvm_irqchip_commit_routes was originally
>> > meant to come after the in-kernel mpic patch, and thus it updated
>> > hw/intc/openpic_kvm.c.  However, it was applied before the in-kernel
>> > mpic patch (which creates hw/intc/openpic_kvm.c), and thus this hunk
>> > got lost.
>> >
>> > Signed-off-by: Scott Wood <scottwood@freescale.com>
>> I'll squash this in with your previous commit if you're ok with that.
> 
> That's fine.

Ok, done.


Alex

Patch

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 809b34b..17d0a35 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -204,6 +204,8 @@  static int kvm_openpic_init(SysBusDevice *dev)
     kvm_msi_via_irqfd_allowed = true;
     kvm_gsi_routing_allowed = true;
 
+    kvm_irqchip_commit_routes(s);
+
     return 0;
 }