diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-12-16 15:55:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-12-16 15:55:32 +0000 |
| commit | 8cadd251b0212adaa3fc6bb278bcb0800840ac18 (patch) | |
| tree | d4ab8885e6e06869693f9e4198de5ad78bf70edb | |
| parent | 78e4d5cbaf472c60ebf0516816b2a38a78b48b0b (diff) | |
| download | qemu-8cadd251b0212adaa3fc6bb278bcb0800840ac18.zip qemu-8cadd251b0212adaa3fc6bb278bcb0800840ac18.tar.gz qemu-8cadd251b0212adaa3fc6bb278bcb0800840ac18.tar.bz2 | |
hw/hyperv/vmbus: Use device_cold_reset() and bus_cold_reset()
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>
| -rw-r--r-- | hw/hyperv/vmbus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 8ee08ae..271289f 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, |