From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Matthew Rosato" <mjrosato@linux.ibm.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
qemu-s390x@nongnu.org, qemu-ppc@nongnu.org
Subject: [PATCH for-8.0 6/9] hw/hyperv/vmbus: Use device_cold_reset() and bus_cold_reset()
Date: Fri, 4 Nov 2022 16:15:10 +0000 [thread overview]
Message-ID: <20221104161513.2455862-7-peter.maydell@linaro.org> (raw)
In-Reply-To: <20221104161513.2455862-1-peter.maydell@linaro.org>
In the vmbus code we currently use the legacy functions
qdev_reset_all() and qbus_reset_all(). These perform a recursive
reset, starting from either a qbus or a qdev. However they do not
permit any of the devices in the tree to use three-phase reset,
because device reset goes through the device_legacy_reset() function
that only calls the single DeviceClass::reset method.
Switch to using the device_cold_reset() and bus_cold_reset()
functions. These also perform a recursive reset, where first the
children are reset and then finally the parent, but they use the new
(...in 2020...) Resettable mechanism, which supports both the old
style single-reset method and also the new 3-phase reset handling.
This should be a no-behaviour-change commit which just reduces the
use of a deprecated API.
Commit created with:
sed -i -e 's/qdev_reset_all/device_cold_reset/g;s/qbus_reset_all/bus_cold_reset/g' hw/hyperv/*.c
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/hyperv/vmbus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 30bc04e1c4c..f345f310b0f 100644
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -1578,7 +1578,7 @@ static bool vmbus_initialized(VMBus *vmbus)
static void vmbus_reset_all(VMBus *vmbus)
{
- qbus_reset_all(BUS(vmbus));
+ bus_cold_reset(BUS(vmbus));
}
static void post_msg(VMBus *vmbus, void *msgdata, uint32_t msglen)
@@ -2035,7 +2035,7 @@ static void vdev_reset_on_close(VMBusDevice *vdev)
}
/* all channels closed -- reset device */
- qdev_reset_all(DEVICE(vdev));
+ device_cold_reset(DEVICE(vdev));
}
static void handle_close_channel(VMBus *vmbus, vmbus_message_close_channel *msg,
--
2.25.1
next prev parent reply other threads:[~2022-11-04 16:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-04 16:15 [PATCH for-8.0 0/9] reset: Remove some deprecated APIs Peter Maydell
2022-11-04 16:15 ` [PATCH for-8.0 1/9] hw/s390x/s390-pci-inst.c: Use device_cold_reset() to reset PCI devices Peter Maydell
2022-11-30 10:07 ` Philippe Mathieu-Daudé
2022-11-04 16:15 ` [PATCH for-8.0 2/9] hw/audio/intel-hda: don't reset codecs twice Peter Maydell
2022-11-04 16:15 ` [PATCH for-8.0 3/9] hw/audio/intel-hda: Drop unnecessary prototype Peter Maydell
2022-11-04 16:15 ` [PATCH for-8.0 4/9] hw/usb/hcd-xhci: Reset the XHCIState with device_cold_reset() Peter Maydell
2022-11-30 10:11 ` Philippe Mathieu-Daudé
2022-11-04 16:15 ` [PATCH for-8.0 5/9] pci: Use device_cold_reset() and bus_cold_reset() Peter Maydell
2022-11-04 17:39 ` Philippe Mathieu-Daudé
2022-11-04 16:15 ` Peter Maydell [this message]
2022-11-10 20:33 ` [PATCH for-8.0 6/9] hw/hyperv/vmbus: " Maciej S. Szmigiero
2022-11-30 10:12 ` Philippe Mathieu-Daudé
2022-11-04 16:15 ` [PATCH for-8.0 7/9] Replace use of qdev_reset_all() with device_cold_reset() Peter Maydell
2022-11-04 17:39 ` Paul Durrant
2022-11-30 10:14 ` Philippe Mathieu-Daudé
2022-11-04 16:15 ` [PATCH for-8.0 8/9] qdev: Remove qdev_reset_all() and qbus_reset_all() Peter Maydell
2022-11-04 17:46 ` Philippe Mathieu-Daudé
2022-11-04 16:15 ` [PATCH for-8.0 9/9] hw: Remove device_legacy_reset() Peter Maydell
2022-11-04 17:43 ` Philippe Mathieu-Daudé
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=20221104161513.2455862-7-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=anthony.perard@citrix.com \
--cc=berrange@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=kraxel@redhat.com \
--cc=maciej.szmigiero@oracle.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mjrosato@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=sstabellini@kernel.org \
/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).