summaryrefslogtreecommitdiffstats
path: root/hw/core/qdev.c
diff options
context:
space:
mode:
authorDamien Hedde2020-01-30 17:02:03 +0100
committerPeter Maydell2020-01-30 17:02:03 +0100
commitf703a04ce558ac3c7c0587a2d919c39efb8ca3ba (patch)
treedc89c0445826aeda40f29c5129a634d48fc7afb9 /hw/core/qdev.c
parenthw/arm/raspi: Remove obsolete use of -smp to set the soc 'enabled-cpus' (diff)
downloadqemu-f703a04ce558ac3c7c0587a2d919c39efb8ca3ba.tar.gz
qemu-f703a04ce558ac3c7c0587a2d919c39efb8ca3ba.tar.xz
qemu-f703a04ce558ac3c7c0587a2d919c39efb8ca3ba.zip
add device_legacy_reset function to prepare for reset api change
Provide a temporary device_legacy_reset function doing what device_reset does to prepare for the transition with Resettable API. All occurrence of device_reset in the code tree are also replaced by device_legacy_reset. The new resettable API has different prototype and semantics (resetting child buses as well as the specified device). Subsequent commits will make the changeover for each call site individually; once that is complete device_legacy_reset() will be removed. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Cornelia Huck <cohuck@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20200123132823.1117486-2-damien.hedde@greensocs.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/qdev.c')
-rw-r--r--hw/core/qdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 05c31df52d..00230eecb7 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -298,7 +298,7 @@ HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
static int qdev_reset_one(DeviceState *dev, void *opaque)
{
- device_reset(dev);
+ device_legacy_reset(dev);
return 0;
}
@@ -867,7 +867,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
}
}
if (dev->hotplugged) {
- device_reset(dev);
+ device_legacy_reset(dev);
}
dev->pending_deleted_event = false;
@@ -1101,7 +1101,7 @@ void device_class_set_parent_unrealize(DeviceClass *dc,
dc->unrealize = dev_unrealize;
}
-void device_reset(DeviceState *dev)
+void device_legacy_reset(DeviceState *dev)
{
DeviceClass *klass = DEVICE_GET_CLASS(dev);