[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/11] hw: Remove device_class_set_parent_reset()
From: |
Peter Maydell |
Subject: |
[PATCH v2 04/11] hw: Remove device_class_set_parent_reset() |
Date: |
Fri, 30 Aug 2024 15:58:05 +0100 |
There are no callers of device_class_set_parent_reset() left in the tree,
as they've all been converted to use three-phase reset and the
corresponding resettable_class_set_parent_phases() function.
Remove device_class_set_parent_reset().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/qdev-core.h | 16 ----------------
hw/core/qdev.c | 8 --------
2 files changed, 24 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 77bfcbdf732..18c7845ce9b 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -937,22 +937,6 @@ char *qdev_get_own_fw_dev_path_from_handler(BusState *bus,
DeviceState *dev);
*/
void device_class_set_props(DeviceClass *dc, Property *props);
-/**
- * device_class_set_parent_reset() - legacy set device reset handlers
- * @dc: device class
- * @dev_reset: function pointer to reset handler
- * @parent_reset: function pointer to parents reset handler
- *
- * Modern code should use the ResettableClass interface to
- * implement a multi-phase reset instead.
- *
- * TODO: remove the function when DeviceClass's reset method
- * is not used anymore.
- */
-void device_class_set_parent_reset(DeviceClass *dc,
- DeviceReset dev_reset,
- DeviceReset *parent_reset);
-
/**
* device_class_set_parent_realize() - set up for chaining realize fns
* @dc: The device class
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index f3a996f57de..cf811580621 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -844,14 +844,6 @@ static void device_class_init(ObjectClass *class, void
*data)
offsetof(DeviceState, parent_bus), NULL, 0);
}
-void device_class_set_parent_reset(DeviceClass *dc,
- DeviceReset dev_reset,
- DeviceReset *parent_reset)
-{
- *parent_reset = dc->reset;
- dc->reset = dev_reset;
-}
-
void device_class_set_parent_realize(DeviceClass *dc,
DeviceRealize dev_realize,
DeviceRealize *parent_realize)
--
2.34.1
- [PATCH v2 00/11] s390: Convert virtio-ccw, cpu to three-phase reset, and followup cleanup, Peter Maydell, 2024/08/30
- [PATCH v2 01/11] hw/s390/ccw-device: Convert to three-phase reset, Peter Maydell, 2024/08/30
- [PATCH v2 02/11] hw/s390/virtio-ccw: Convert to three-phase reset, Peter Maydell, 2024/08/30
- [PATCH v2 04/11] hw: Remove device_class_set_parent_reset(),
Peter Maydell <=
- [PATCH v2 05/11] target/alpha, hppa: Remove unused parent_reset fields, Peter Maydell, 2024/08/30
- [PATCH v2 06/11] hw: Define new device_class_set_legacy_reset(), Peter Maydell, 2024/08/30
- [PATCH v2 03/11] target/s390: Convert CPU to Resettable interface, Peter Maydell, 2024/08/30
- [PATCH v2 08/11] hw: Rename DeviceClass::reset field to legacy_reset, Peter Maydell, 2024/08/30
- [PATCH v2 10/11] hw/core/qdev: Simplify legacy_reset handling, Peter Maydell, 2024/08/30
- [PATCH v2 09/11] hw: Remove device_phases_reset(), Peter Maydell, 2024/08/30
- [PATCH v2 11/11] hw/core/resettable: Remove transitional_function machinery, Peter Maydell, 2024/08/30
- [PATCH v2 07/11] hw: Use device_class_set_legacy_reset() instead of opencoding, Peter Maydell, 2024/08/30