From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"David Hildenbrand" <david@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Nico Boehr" <nrb@linux.ibm.com>,
"Nina Schoetterl-Glausch" <nsg@linux.ibm.com>
Subject: [PATCH v2 04/11] hw: Remove device_class_set_parent_reset()
Date: Fri, 30 Aug 2024 15:58:05 +0100 [thread overview]
Message-ID: <20240830145812.1967042-5-peter.maydell@linaro.org> (raw)
In-Reply-To: <20240830145812.1967042-1-peter.maydell@linaro.org>
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
next prev parent reply other threads:[~2024-08-30 15:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-30 14:58 [PATCH v2 00/11] s390: Convert virtio-ccw, cpu to three-phase reset, and followup cleanup Peter Maydell
2024-08-30 14:58 ` [PATCH v2 01/11] hw/s390/ccw-device: Convert to three-phase reset Peter Maydell
2024-09-03 12:33 ` Nina Schoetterl-Glausch
2024-09-03 14:53 ` Philippe Mathieu-Daudé
2024-09-04 6:21 ` Thomas Huth
2024-08-30 14:58 ` [PATCH v2 02/11] hw/s390/virtio-ccw: " Peter Maydell
2024-08-30 14:58 ` [PATCH v2 03/11] target/s390: Convert CPU to Resettable interface Peter Maydell
2024-08-30 14:58 ` Peter Maydell [this message]
2024-08-30 14:58 ` [PATCH v2 05/11] target/alpha, hppa: Remove unused parent_reset fields Peter Maydell
2024-09-03 14:42 ` Philippe Mathieu-Daudé
2024-08-30 14:58 ` [PATCH v2 06/11] hw: Define new device_class_set_legacy_reset() Peter Maydell
2024-08-30 14:58 ` [PATCH v2 07/11] hw: Use device_class_set_legacy_reset() instead of opencoding Peter Maydell
2024-08-30 14:58 ` [PATCH v2 08/11] hw: Rename DeviceClass::reset field to legacy_reset Peter Maydell
2024-08-30 14:58 ` [PATCH v2 09/11] hw: Remove device_phases_reset() Peter Maydell
2024-08-30 14:58 ` [PATCH v2 10/11] hw/core/qdev: Simplify legacy_reset handling Peter Maydell
2024-09-03 14:52 ` Philippe Mathieu-Daudé
2024-08-30 14:58 ` [PATCH v2 11/11] hw/core/resettable: Remove transitional_function machinery Peter Maydell
2024-09-03 14:52 ` Philippe Mathieu-Daudé
2024-09-06 14:38 ` [PATCH v2 00/11] s390: Convert virtio-ccw, cpu to three-phase reset, and followup cleanup Peter Maydell
2024-09-09 13:47 ` Nina Schoetterl-Glausch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240830145812.1967042-5-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=nrb@linux.ibm.com \
--cc=nsg@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).