From: Philippe Mathieu-Daudé <[email protected]> The HotplugHandlerClass pointers are only dereferenced, not updated.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Message-ID: <[email protected]> --- include/hw/core/qdev.h | 2 +- hw/core/hotplug.c | 8 ++++---- hw/s390x/virtio-ccw-md.c | 2 +- hw/virtio/virtio-md-pci.c | 2 +- system/qdev-monitor.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/core/qdev.h b/include/hw/core/qdev.h index f054a214fc..e4cb027ab3 100644 --- a/include/hw/core/qdev.h +++ b/include/hw/core/qdev.h @@ -1069,7 +1069,7 @@ static inline bool qbus_is_hotpluggable(BusState *bus) bool ret = !!plug_handler; if (plug_handler) { - HotplugHandlerClass *hdc; + const HotplugHandlerClass *hdc; hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); if (hdc->is_hotpluggable_bus) { diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c index 68aabad8ae..00e80a67c8 100644 --- a/hw/core/hotplug.c +++ b/hw/core/hotplug.c @@ -17,7 +17,7 @@ void hotplug_handler_pre_plug(HotplugHandler *plug_handler, DeviceState *plugged_dev, Error **errp) { - HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); + const HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); if (hdc->pre_plug) { hdc->pre_plug(plug_handler, plugged_dev, errp); @@ -28,7 +28,7 @@ void hotplug_handler_plug(HotplugHandler *plug_handler, DeviceState *plugged_dev, Error **errp) { - HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); + const HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); if (hdc->plug) { hdc->plug(plug_handler, plugged_dev, errp); @@ -39,7 +39,7 @@ void hotplug_handler_unplug_request(HotplugHandler *plug_handler, DeviceState *plugged_dev, Error **errp) { - HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); + const HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); if (hdc->unplug_request) { hdc->unplug_request(plug_handler, plugged_dev, errp); @@ -50,7 +50,7 @@ void hotplug_handler_unplug(HotplugHandler *plug_handler, DeviceState *plugged_dev, Error **errp) { - HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); + const HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); if (hdc->unplug) { hdc->unplug(plug_handler, plugged_dev, errp); diff --git a/hw/s390x/virtio-ccw-md.c b/hw/s390x/virtio-ccw-md.c index 0370f58450..0b18b49bc4 100644 --- a/hw/s390x/virtio-ccw-md.c +++ b/hw/s390x/virtio-ccw-md.c @@ -73,7 +73,7 @@ void virtio_ccw_md_unplug_request(VirtIOMDCcw *vmd, MachineState *ms, VirtIOMDCcwClass *vmdc = VIRTIO_MD_CCW_GET_CLASS(vmd); DeviceState *dev = DEVICE(vmd); HotplugHandler *bus_handler = qdev_get_bus_hotplug_handler(dev); - HotplugHandlerClass *hdc; + const HotplugHandlerClass *hdc; Error *local_err = NULL; if (!vmdc->unplug_request_check) { diff --git a/hw/virtio/virtio-md-pci.c b/hw/virtio/virtio-md-pci.c index 9278b32cf8..aa5b11c0f6 100644 --- a/hw/virtio/virtio-md-pci.c +++ b/hw/virtio/virtio-md-pci.c @@ -72,7 +72,7 @@ void virtio_md_pci_unplug_request(VirtIOMDPCI *vmd, MachineState *ms, VirtIOMDPCIClass *vmdc = VIRTIO_MD_PCI_GET_CLASS(vmd); DeviceState *dev = DEVICE(vmd); HotplugHandler *bus_handler = qdev_get_bus_hotplug_handler(dev); - HotplugHandlerClass *hdc; + const HotplugHandlerClass *hdc; Error *local_err = NULL; if (!vmdc->unplug_request_check) { diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 5c87fda509..0c5502d45b 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -918,7 +918,7 @@ static DeviceState *find_device_state(const char *id, bool use_generic_error, void qdev_unplug(DeviceState *dev, Error **errp) { HotplugHandler *hotplug_ctrl; - HotplugHandlerClass *hdc; + const HotplugHandlerClass *hdc; Error *local_err = NULL; if (!qdev_hotunplug_allowed(dev, errp)) { -- MST
