From patchwork Tue Jun 1 18:32:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 54283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 04D72B6F11 for ; Wed, 2 Jun 2010 05:05:30 +1000 (EST) Received: from localhost ([127.0.0.1]:46681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJWmF-0004MB-8D for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 15:05:27 -0400 Received: from [140.186.70.92] (port=50185 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJWVe-0001DM-J9 for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:48:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJWGW-0006pL-T4 for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:32:43 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44336) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJWGW-0006oI-Ef for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:32:40 -0400 Received: from blackfin.pond.sub.org (pD9E39C24.dip.t-dialin.net [217.227.156.36]) by oxygen.pond.sub.org (Postfix) with ESMTPA id DCFF131287E for ; Tue, 1 Jun 2010 20:32:36 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 348DA368; Tue, 1 Jun 2010 20:32:36 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 1 Jun 2010 20:32:31 +0200 Message-Id: <1275417155-28244-11-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1275417155-28244-1-git-send-email-armbru@redhat.com> References: <1275417155-28244-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 10/14] qdev: Don't leak string property value on hot unplug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org parse_string() qemu_strdup()s the property value. It is never freed. It needs to be freed along with the device. Otherwise, the value of scsi-disk property "ver" gets leaked when hot-unplugging the disk, for instance. Call new PropertyInfo method free() from qdev_free(). Implement it for qdev_prop_string. Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 6 ++++++ hw/qdev.c | 6 ++++++ hw/qdev.h | 1 + 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index b6ee50f..48a6b45 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -260,6 +260,11 @@ static int parse_string(DeviceState *dev, Property *prop, const char *str) return 0; } +static void free_string(DeviceState *dev, Property *prop) +{ + qemu_free(*(char **)qdev_get_prop_ptr(dev, prop)); +} + static int print_string(DeviceState *dev, Property *prop, char *dest, size_t len) { char **ptr = qdev_get_prop_ptr(dev, prop); @@ -274,6 +279,7 @@ PropertyInfo qdev_prop_string = { .size = sizeof(char*), .parse = parse_string, .print = print_string, + .free = free_string, }; /* --- drive --- */ diff --git a/hw/qdev.c b/hw/qdev.c index af17486..09ff6fc 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -334,6 +334,7 @@ void qdev_init_nofail(DeviceState *dev) void qdev_free(DeviceState *dev) { BusState *bus; + Property *prop; if (dev->state == DEV_STATE_INITIALIZED) { while (dev->num_child_bus) { @@ -349,6 +350,11 @@ void qdev_free(DeviceState *dev) } qemu_unregister_reset(qdev_reset, dev); QLIST_REMOVE(dev, sibling); + for (prop = dev->info->props; prop && prop->name; prop++) { + if (prop->info->free) { + prop->info->free(dev, prop); + } + } qemu_free(dev); } diff --git a/hw/qdev.h b/hw/qdev.h index 7c25a94..51a24e2 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -98,6 +98,7 @@ struct PropertyInfo { enum PropertyType type; int (*parse)(DeviceState *dev, Property *prop, const char *str); int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); + void (*free)(DeviceState *dev, Property *prop); }; typedef struct GlobalProperty {