ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdev: Don't leak string property value on hot unplug 

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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2010-06-01 20:32:31 +02:00 committed by Kevin Wolf
parent cc98467327
commit d21357df9a
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/qdev-properties.c
View File

@ -260,6 +260,11 @@ static int parse_string(DeviceState *dev, Property *prop, const char *str)
return 0; 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) static int print_string(DeviceState *dev, Property *prop, char *dest, size_t len)
{ {
char **ptr = qdev_get_prop_ptr(dev, prop); char **ptr = qdev_get_prop_ptr(dev, prop);
@ -274,6 +279,7 @@ PropertyInfo qdev_prop_string = {
.size = sizeof(char*), .size = sizeof(char*),
.parse = parse_string, .parse = parse_string,
.print = print_string, .print = print_string,
.free = free_string,
}; };
/* --- drive --- */ /* --- drive --- */

6
hw/qdev.c
View File

@ -334,6 +334,7 @@ void qdev_init_nofail(DeviceState *dev)
void qdev_free(DeviceState *dev) void qdev_free(DeviceState *dev)
{ {
BusState *bus; BusState *bus;
Property *prop;
if (dev->state == DEV_STATE_INITIALIZED) { if (dev->state == DEV_STATE_INITIALIZED) {
while (dev->num_child_bus) { while (dev->num_child_bus) {
@ -349,6 +350,11 @@ void qdev_free(DeviceState *dev)
} }
qemu_unregister_reset(qdev_reset, dev); qemu_unregister_reset(qdev_reset, dev);
QLIST_REMOVE(dev, sibling); 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); qemu_free(dev);
} }

1
hw/qdev.h
View File

@ -98,6 +98,7 @@ struct PropertyInfo {
enum PropertyType type; enum PropertyType type;
int (*parse)(DeviceState *dev, Property *prop, const char *str); int (*parse)(DeviceState *dev, Property *prop, const char *str);
int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);
void (*free)(DeviceState *dev, Property *prop);
}; };
typedef struct GlobalProperty { typedef struct GlobalProperty {