Patchwork [06/27] pci: check for an initialized QOM object instead of looking for an info link

login
register
mail settings
Submitter Anthony Liguori
Date Dec. 20, 2011, 4:51 p.m.
Message ID <1324399916-21315-7-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/132450/
State New
Headers show

Comments

Anthony Liguori - Dec. 20, 2011, 4:51 p.m.
We want to eliminate DeviceInfo so update the PCI check to look for a valid
class pointer.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/pci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/pci.c b/hw/pci.c
index 4fc46c2..3ea6223 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -161,8 +161,8 @@  void pci_device_reset(PCIDevice *dev)
     int r;
     /* TODO: call the below unconditionally once all pci devices
      * are qdevified */
-    if (qdev_get_info(&dev->qdev)) {
-        qdev_reset_all(&dev->qdev);
+    if (OBJECT(dev)->class != NULL) {
+        qdev_reset_all(DEVICE(dev));
     }
 
     dev->irq_state = 0;