From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@redhat.com>
Subject: Re: [PATCH] pci-assign: Fix transition MSI->INTx
Date: Thu, 06 Jan 2011 06:51:00 -0700
Message-ID: <1294321860.16322.1.camel@x201>
References: <4D238B5E.9010102@web.de>  <4D25C63F.2020908@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Cc: Jan Kiszka <jan.kiszka@web.de>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	kvm <kvm@vger.kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>
To: Avi Kivity <avi@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:54655 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751436Ab1AFNvC (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 6 Jan 2011 08:51:02 -0500
In-Reply-To: <4D25C63F.2020908@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Thu, 2011-01-06 at 15:40 +0200, Avi Kivity wrote:
> On 01/04/2011 11:04 PM, Jan Kiszka wrote:
> > From: Jan Kiszka<jan.kiszka@siemens.com>
> >
> > Make sure to re-register the IRQ of an assigned device as INTx when the
> > guest disables MSI[X] mode again.
> >
> > Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
> 
> Cc: More Reviewers

Looks fine to me.

Acked-by: Alex Williamson <alex.williamson@redhat.com>

> > ---
> >   hw/device-assignment.c |    6 ++++++
> >   1 files changed, 6 insertions(+), 0 deletions(-)
> >
> > diff --git a/hw/device-assignment.c b/hw/device-assignment.c
> > index f6410f8..fce7567 100644
> > --- a/hw/device-assignment.c
> > +++ b/hw/device-assignment.c
> > @@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
> >           if (kvm_assign_irq(kvm_context,&assigned_irq_data)<  0)
> >               perror("assigned_dev_enable_msi: assign irq");
> >
> > +        assigned_dev->girq = -1;
> >           assigned_dev->irq_requested_type = assigned_irq_data.flags;
> > +    } else {
> > +        assign_irq(assigned_dev);
> >       }
> >   }
> >   #endif
> > @@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
> >               perror("assigned_dev_enable_msix: assign irq");
> >               return;
> >           }
> > +        assigned_dev->girq = -1;
> >           assigned_dev->irq_requested_type = assigned_irq_data.flags;
> > +    } else {
> > +        assign_irq(assigned_dev);
> >       }
> >   }
> >   #endif
> 
>