ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/s390/virtio-ccw: Convert to three-phase reset 

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.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240830145812.1967042-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-09-13 15:31:43 +01:00
parent 6a0e10b76b
commit 6affa00d6e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/s390x/virtio-ccw.c
View File

@ -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); VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_GET_CLASS(dev);
virtio_ccw_reset_virtio(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); DeviceClass *dc = DEVICE_CLASS(klass);
CCWDeviceClass *k = CCW_DEVICE_CLASS(dc); CCWDeviceClass *k = CCW_DEVICE_CLASS(dc);
VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_CLASS(klass); VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
k->unplug = virtio_ccw_busdev_unplug; k->unplug = virtio_ccw_busdev_unplug;
dc->realize = virtio_ccw_busdev_realize; dc->realize = virtio_ccw_busdev_realize;
dc->unrealize = virtio_ccw_busdev_unrealize; 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 = { static const TypeInfo virtio_ccw_device_info = {

2
hw/s390x/virtio-ccw.h
View File

@ -57,7 +57,7 @@ struct VirtIOCCWDeviceClass {
CCWDeviceClass parent_class; CCWDeviceClass parent_class;
void (*realize)(VirtioCcwDevice *dev, Error **errp); void (*realize)(VirtioCcwDevice *dev, Error **errp);
void (*unrealize)(VirtioCcwDevice *dev); void (*unrealize)(VirtioCcwDevice *dev);
void (*parent_reset)(DeviceState *dev); ResettablePhases parent_phases;
}; };
/* Performance improves when virtqueue kick processing is decoupled from the /* Performance improves when virtqueue kick processing is decoupled from the