Patchwork [03/28] pci: call reset unconditionally

login
register
mail settings
Submitter Anthony Liguori
Date Jan. 24, 2012, 7:32 p.m.
Message ID <1327433600-7403-4-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/137641/
State New
Headers show

Comments

Anthony Liguori - Jan. 24, 2012, 7:32 p.m.
Because now all PCI devices are converted to qdev.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/pci.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
Michael S. Tsirkin - Jan. 25, 2012, 12:42 p.m.
On Tue, Jan 24, 2012 at 01:32:55PM -0600, Anthony Liguori wrote:
> Because now all PCI devices are converted to qdev.
> 
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Finally!

> ---
>  hw/pci.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 54400ac..ab3b53d 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -159,11 +159,8 @@ void pci_device_deassert_intx(PCIDevice *dev)
>  void pci_device_reset(PCIDevice *dev)
>  {
>      int r;
> -    /* TODO: call the below unconditionally once all pci devices
> -     * are qdevified */
> -    if (dev->qdev.info) {
> -        qdev_reset_all(&dev->qdev);
> -    }
> +
> +    qdev_reset_all(&dev->qdev);
>  
>      dev->irq_state = 0;
>      pci_update_irq_status(dev);
> -- 
> 1.7.4.1
Anthony Liguori - Jan. 25, 2012, 1:28 p.m.
On 01/25/2012 06:42 AM, Michael S. Tsirkin wrote:
> On Tue, Jan 24, 2012 at 01:32:55PM -0600, Anthony Liguori wrote:
>> Because now all PCI devices are converted to qdev.
>>
>> Signed-off-by: Anthony Liguori<aliguori@us.ibm.com>
>
> Finally!

Yeah, I hope there's more cleanup that can come out of this.

Regards,

Anthony Liguori

>
>> ---
>>   hw/pci.c |    7 ++-----
>>   1 files changed, 2 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/pci.c b/hw/pci.c
>> index 54400ac..ab3b53d 100644
>> --- a/hw/pci.c
>> +++ b/hw/pci.c
>> @@ -159,11 +159,8 @@ void pci_device_deassert_intx(PCIDevice *dev)
>>   void pci_device_reset(PCIDevice *dev)
>>   {
>>       int r;
>> -    /* TODO: call the below unconditionally once all pci devices
>> -     * are qdevified */
>> -    if (dev->qdev.info) {
>> -        qdev_reset_all(&dev->qdev);
>> -    }
>> +
>> +    qdev_reset_all(&dev->qdev);
>>
>>       dev->irq_state = 0;
>>       pci_update_irq_status(dev);
>> --
>> 1.7.4.1
>

Patch

diff --git a/hw/pci.c b/hw/pci.c
index 54400ac..ab3b53d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -159,11 +159,8 @@  void pci_device_deassert_intx(PCIDevice *dev)
 void pci_device_reset(PCIDevice *dev)
 {
     int r;
-    /* TODO: call the below unconditionally once all pci devices
-     * are qdevified */
-    if (dev->qdev.info) {
-        qdev_reset_all(&dev->qdev);
-    }
+
+    qdev_reset_all(&dev->qdev);
 
     dev->irq_state = 0;
     pci_update_irq_status(dev);