From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Re: [PATCH RFC] qemu: fix hot remove assigned device
Date: Wed, 10 Jun 2009 11:06:21 +0300
Message-ID: <4A2F697D.8070405@redhat.com>
References: <1244481435-17224-1-git-send-email-weidong.han@intel.com> <200906081538.22186.paul@codesourcery.com> <715D42877B251141A38726ABF5CABF2C054590C496@pdsmsx503.ccr.corp.intel.com> <200906091551.41674.paul@codesourcery.com> <4A2E81A9.4060501@redhat.com> <715D42877B251141A38726ABF5CABF2C054596A9FF@pdsmsx503.ccr.corp.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: "'Gerd Hoffmann'" <kraxel@redhat.com>,
	"'Paul Brook'" <paul@codesourcery.com>,
	"'kvm@vger.kernel.org'" <kvm@vger.kernel.org>
To: "Han, Weidong" <weidong.han@intel.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:36020 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754206AbZFJIIV (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 10 Jun 2009 04:08:21 -0400
In-Reply-To: <715D42877B251141A38726ABF5CABF2C054596A9FF@pdsmsx503.ccr.corp.intel.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Han, Weidong wrote:
>  
> -int pci_unregister_device(PCIDevice *pci_dev)
> +int pci_unregister_device(PCIDevice *pci_dev, int assigned)
>  {
>      int ret = 0;
>  
> @@ -377,7 +377,11 @@ int pci_unregister_device(PCIDevice *pci_dev)
>      qemu_free_irqs(pci_dev->irq);
>      pci_irq_index--;
>      pci_dev->bus->devices[pci_dev->devfn] = NULL;
> -    qdev_free(&pci_dev->qdev);
> +
> +    if (assigned)
> +        qemu_free(pci_dev);
> +    else
> +        qdev_free(&pci_dev->qdev);
>      return 0;
>  }
>   

Can you check pci_dev->qdev instead of assigned?  A little less ugly.

-- 
error compiling committee.c: too many arguments to function