From patchwork Mon Nov 2 06:27:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: qdev: Check if unplug handler exists before calling it Date: Sun, 01 Nov 2009 20:27:56 -0000 From: Amit Shah X-Patchwork-Id: 37400 Message-Id: <1257143276-9428-1-git-send-email-amit.shah@redhat.com> To: qemu-devel@nongnu.org Cc: Amit Shah A bus may have hotplugging enabled but not have the 'unplug' callback defined, which would lead to a crash on trying to unplug a device on the bus. Fix by checking if the callback is valid Signed-off-by: Amit Shah --- hw/qdev.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 374d2d0..1a9eb2e 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -258,6 +258,11 @@ int qdev_unplug(DeviceState *dev) dev->parent_bus->name); return -1; } + if (!dev->info->unplug) { + qemu_error("Unplug event for bus %s not defined\n", + dev->parent_bus->name); + return -1; + } return dev->info->unplug(dev); }