From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bphkT-0003Ys-Em for qemu-devel@nongnu.org; Thu, 29 Sep 2016 16:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bphkQ-0004pp-KS for qemu-devel@nongnu.org; Thu, 29 Sep 2016 16:16:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bphkQ-0004pg-Em for qemu-devel@nongnu.org; Thu, 29 Sep 2016 16:16:02 -0400 From: John Snow Date: Thu, 29 Sep 2016 16:15:56 -0400 Message-Id: <1475180156-5572-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1475180156-5572-1-git-send-email-jsnow@redhat.com> References: <1475180156-5572-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 4/4] ide: Fix memory leak in ide_register_restart_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com, Ashijeet Acharya From: Ashijeet Acharya Fix a memory leak in ide_register_restart_cb() in hw/ide/core.c and add idebus_unrealize() in hw/ide/qdev.c to have calls to qemu_del_vm_change_state_handler() to deal with the dangling change state handler during hot-unplugging ide devices which might lead to a crash. Signed-off-by: Ashijeet Acharya Reviewed-by: John Snow Message-id: 1474995212-10580-1-git-send-email-ashijeetacharya@gmail.com [Minor whitespace fix --js] Signed-off-by: John Snow --- hw/ide/core.c | 2 +- hw/ide/qdev.c | 11 +++++++++++ include/hw/ide/internal.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 1bee18d..7291677 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2582,7 +2582,7 @@ static void ide_restart_cb(void *opaque, int running, RunState state) void ide_register_restart_cb(IDEBus *bus) { if (bus->dma->ops->restart_dma) { - qemu_add_vm_change_state_handler(ide_restart_cb, bus); + bus->vmstate = qemu_add_vm_change_state_handler(ide_restart_cb, bus); } } diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 2eb055a..dbaa75c 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -31,6 +31,7 @@ /* --------------------------------- */ static char *idebus_get_fw_dev_path(DeviceState *dev); +static void idebus_unrealize(DeviceState *qdev, Error **errp); static Property ide_props[] = { DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1), @@ -44,6 +45,15 @@ static void ide_bus_class_init(ObjectClass *klass, void *data) k->get_fw_dev_path = idebus_get_fw_dev_path; } +static void idebus_unrealize(DeviceState *qdev, Error **errp) +{ + IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev->parent_bus); + + if (bus->vmstate) { + qemu_del_vm_change_state_handler(bus->vmstate); + } +} + static const TypeInfo ide_bus_info = { .name = TYPE_IDE_BUS, .parent = TYPE_BUS, @@ -355,6 +365,7 @@ static void ide_device_class_init(ObjectClass *klass, void *data) k->init = ide_qdev_init; set_bit(DEVICE_CATEGORY_STORAGE, k->categories); k->bus_type = TYPE_IDE_BUS; + k->unrealize = idebus_unrealize; k->props = ide_props; } diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index a6dd2c3..88dc118 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -482,6 +482,7 @@ struct IDEBus { uint32_t retry_nsector; PortioList portio_list; PortioList portio2_list; + VMChangeStateEntry *vmstate; }; #define TYPE_IDE_DEVICE "ide-device" -- 2.7.4