commit 959f733a296a69564a075d60d8c821ad8e258623
author Gerd Hoffmann <kraxel@redhat.com> Tue Sep 01 09:56:12 2009 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Wed Sep 09 14:57:20 2009 -0500
tree e261867939613c7f7b4887f710bb9a50836e1b92
parent 7fc2f2c0869f68eaa42446e5a394d79bb7c9f7f7

qdev: integrate reset

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/qdev.c

diff --git a/hw/qdev.c b/hw/qdev.c
index 0e9732b..675248f 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -214,12 +214,21 @@
    calling this function.  */
 int qdev_init(DeviceState *dev)
 {
-    return dev->info->init(dev, dev->info);
+    int rc;
+
+    rc = dev->info->init(dev, dev->info);
+    if (rc < 0)
+        return rc;
+    if (dev->info->reset)
+        qemu_register_reset(dev->info->reset, dev);
+    return 0;
 }
 
 /* Unlink device from bus and free the structure.  */
 void qdev_free(DeviceState *dev)
 {
+    if (dev->info->reset)
+        qemu_unregister_reset(dev->info->reset, dev);
     LIST_REMOVE(dev, sibling);
     qemu_free(dev);
 }