Re: [PATCH for-9.2 01/10] hw/s390/virtio-ccw: Convert to three-phase reset

[Thomas Huth]

On 13/08/2024 18.52, Peter Maydell wrote:

Convert the virtio-ccw code to three-phase reset.  This allows us to
remove a call to device_class_set_parent_reset(), replacing it with
the three-phase equivalent resettable_class_set_parent_phases().
Removing all the device_class_set_parent_reset() uses will allow us
to remove some of the glue code that interworks between three-phase
and legacy reset.

This is a simple conversion, with no behavioural changes.

Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
It looks a little odd that we do the this-class reset first
and then chain up to the parent's reset, but that's what the
existing code does, so I left it alone.
---
  hw/s390x/virtio-ccw.h |  2 +-
  hw/s390x/virtio-ccw.c | 13 ++++++++-----
  2 files changed, 9 insertions(+), 6 deletions(-)

Acked-by: Thomas Huth <th...@redhat.com>

diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
index fac186c8f64..c7a830a1944 100644
--- a/hw/s390x/virtio-ccw.h
+++ b/hw/s390x/virtio-ccw.h
@@ -57,7 +57,7 @@ struct VirtIOCCWDeviceClass {
      CCWDeviceClass parent_class;
      void (*realize)(VirtioCcwDevice *dev, Error **errp);
      void (*unrealize)(VirtioCcwDevice *dev);
-    void (*parent_reset)(DeviceState *dev);
+    ResettablePhases parent_phases;
  };

/* Performance improves when virtqueue kick processing is decoupled from the

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index b4676909dd6..96747318d2a 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -913,14 +913,15 @@ static void virtio_ccw_notify(DeviceState *d, uint16_t 
vector)
      }
  }

-static void virtio_ccw_reset(DeviceState *d)

+static void virtio_ccw_reset_hold(Object *obj, ResetType type)
  {
-    VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
+    VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(obj);
      VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_GET_CLASS(dev);

virtio_ccw_reset_virtio(dev);

-    if (vdc->parent_reset) {
-        vdc->parent_reset(d);
+
+    if (vdc->parent_phases.hold) {
+        vdc->parent_phases.hold(obj, type);
      }
  }

@@ -1233,11 +1234,13 @@ static void virtio_ccw_device_class_init(ObjectClass *klass, void *data)

      DeviceClass *dc = DEVICE_CLASS(klass);
      CCWDeviceClass *k = CCW_DEVICE_CLASS(dc);
      VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_CLASS(klass);
+    ResettableClass *rc = RESETTABLE_CLASS(klass);

k->unplug = virtio_ccw_busdev_unplug;

      dc->realize = virtio_ccw_busdev_realize;
      dc->unrealize = virtio_ccw_busdev_unrealize;
-    device_class_set_parent_reset(dc, virtio_ccw_reset, &vdc->parent_reset);
+    resettable_class_set_parent_phases(rc, NULL, virtio_ccw_reset_hold, NULL,
+                                       &vdc->parent_phases);
  }

static const TypeInfo virtio_ccw_device_info = {