qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 03/36] hw/hyperv/vmbus: Use device_cold_reset() and bus_cold_reset()
Date: Fri, 16 Dec 2022 21:42:11 +0000	[thread overview]
Message-ID: <20221216214244.1391647-4-peter.maydell@linaro.org> (raw)
In-Reply-To: <20221216214244.1391647-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 8ee08aea46c..271289f902f 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



  parent reply	other threads:[~2022-12-16 22:30 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 21:42 [PULL 00/36] reset refactoring patches Peter Maydell
2022-12-16 21:42 ` [PULL 01/36] hw/s390x/s390-pci-inst.c: Use device_cold_reset() to reset PCI devices Peter Maydell
2022-12-16 21:42 ` [PULL 02/36] pci: Use device_cold_reset() and bus_cold_reset() Peter Maydell
2022-12-16 21:42 ` Peter Maydell [this message]
2022-12-16 21:42 ` [PULL 04/36] Replace use of qdev_reset_all() with device_cold_reset() Peter Maydell
2022-12-16 21:42 ` [PULL 05/36] qdev: Remove qdev_reset_all() and qbus_reset_all() Peter Maydell
2022-12-16 21:42 ` [PULL 06/36] hw: Remove device_legacy_reset() Peter Maydell
2022-12-16 21:42 ` [PULL 07/36] hw/input/ps2: Convert TYPE_PS2_DEVICE to 3-phase reset Peter Maydell
2022-12-16 21:42 ` [PULL 08/36] hw/input/ps2.c: Convert TYPE_PS2_{KBD, MOUSE}_DEVICE " Peter Maydell
2022-12-16 21:42 ` [PULL 09/36] hw/misc/mos6522: Convert TYPE_MOS6522 " Peter Maydell
2022-12-16 21:42 ` [PULL 10/36] hw/misc: Convert TYPE_MOS6522 subclasses " Peter Maydell
2022-12-16 21:42 ` [PULL 11/36] hw/core/cpu-common: Convert TYPE_CPU class " Peter Maydell
2022-12-16 21:42 ` [PULL 12/36] target/arm: Convert " Peter Maydell
2022-12-16 21:42 ` [PULL 13/36] target/avr: " Peter Maydell
2022-12-16 21:42 ` [PULL 14/36] target/cris: " Peter Maydell
2022-12-16 21:42 ` [PULL 15/36] target/hexagon: " Peter Maydell
2022-12-16 21:42 ` [PULL 16/36] target/i386: " Peter Maydell
2022-12-16 21:42 ` [PULL 17/36] target/loongarch: " Peter Maydell
2022-12-16 21:42 ` [PULL 18/36] target/m68k: " Peter Maydell
2022-12-16 21:42 ` [PULL 19/36] target/microblaze: " Peter Maydell
2022-12-16 21:42 ` [PULL 20/36] target/mips: " Peter Maydell
2022-12-16 21:42 ` [PULL 21/36] target/nios2: " Peter Maydell
2022-12-16 21:42 ` [PULL 22/36] target/openrisc: " Peter Maydell
2022-12-16 21:42 ` [PULL 23/36] target/ppc: " Peter Maydell
2022-12-16 21:42 ` [PULL 24/36] target/riscv: " Peter Maydell
2022-12-16 21:42 ` [PULL 25/36] target/rx: " Peter Maydell
2022-12-16 21:42 ` [PULL 26/36] target/sh4: " Peter Maydell
2022-12-16 21:42 ` [PULL 27/36] target/sparc: " Peter Maydell
2022-12-16 21:42 ` [PULL 28/36] target/tricore: " Peter Maydell
2022-12-16 21:42 ` [PULL 29/36] target/xtensa: " Peter Maydell
2022-12-16 21:42 ` [PULL 30/36] hw/virtio: Convert TYPE_VIRTIO_PCI " Peter Maydell
2022-12-16 21:42 ` [PULL 31/36] hw/display/virtio-vga: Convert TYPE_VIRTIO_VGA_BASE " Peter Maydell
2022-12-16 21:42 ` [PULL 32/36] pci: Convert TYPE_PCIE_ROOT_PORT " Peter Maydell
2022-12-16 21:42 ` [PULL 33/36] pci: Convert child classes of " Peter Maydell
2022-12-16 21:42 ` [PULL 34/36] hw/intc/xics: Reset TYPE_ICS objects with device_cold_reset() Peter Maydell
2022-12-16 21:42 ` [PULL 35/36] hw/intc/xics: Convert TYPE_ICS to 3-phase reset Peter Maydell
2022-12-16 21:42 ` [PULL 36/36] hw/pci-host/pnv_phb3_msi: Convert TYPE_PHB3_MSI " Peter Maydell
2022-12-17 21:18 ` [PULL 00/36] reset refactoring patches Peter Maydell

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=20221216214244.1391647-4-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.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).