From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=55082 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBuO6-0000SB-BQ
	for qemu-devel@nongnu.org; Tue, 11 May 2010 14:41:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <alex.williamson@redhat.com>) id 1OBuO1-0001KK-JC
	for qemu-devel@nongnu.org; Tue, 11 May 2010 14:41:02 -0400
Received: from mx1.redhat.com ([209.132.183.28]:60043)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <alex.williamson@redhat.com>) id 1OBuO1-0001Ju-Aj
	for qemu-devel@nongnu.org; Tue, 11 May 2010 14:40:57 -0400
Subject: Re: [Qemu-devel] [PATCH] pci: cleanly backout of pci_qdev_init()
From: Alex Williamson <alex.williamson@redhat.com>
In-Reply-To: <AANLkTimIxCqy7lau-nd8VLfoFjXXFNtf1p7Oem4HjVyS@mail.gmail.com>
References: <20100510150016.15398.36521.stgit@virtlab9.virt.bos.redhat.com>
	<AANLkTimIxCqy7lau-nd8VLfoFjXXFNtf1p7Oem4HjVyS@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Date: Tue, 11 May 2010 12:40:52 -0600
Message-ID: <1273603252.2682.50.camel@localhost>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org

On Tue, 2010-05-11 at 21:17 +0300, Blue Swirl wrote:
> On 5/10/10, Alex Williamson <alex.williamson@redhat.com> wrote:
> >
> >   hw/pci.c |   17 ++++++++++++-----
> >   1 files changed, 12 insertions(+), 5 deletions(-)
> >
> >  diff --git a/hw/pci.c b/hw/pci.c
> >  index f167436..3d3560e 100644
> >  --- a/hw/pci.c
> >  +++ b/hw/pci.c
> >  @@ -625,6 +625,14 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
> >      return pci_dev;
> >   }
> >
> >  +static void do_pci_unregister_device(PCIDevice *pci_dev)
> >  +{
> >  +    qemu_free_irqs(pci_dev->irq);
> >  +    pci_dev->bus->devices[pci_dev->devfn] = NULL;
> >  +    pci_config_free(pci_dev);
> >  +    return;
> 
> Isn't this 'return' useless?

Yeah, I'll remove it.

Alex