diff options
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/qdev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index a9647d42ae..71c7facf60 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -238,12 +238,10 @@ HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) { - HotplugHandler *hotplug_ctrl; + HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev); - if (dev->parent_bus && dev->parent_bus->hotplug_handler) { + if (hotplug_ctrl == NULL && dev->parent_bus) { hotplug_ctrl = dev->parent_bus->hotplug_handler; - } else { - hotplug_ctrl = qdev_get_machine_hotplug_handler(dev); } return hotplug_ctrl; } |