Revision 7267c094 hw/qdev.c
| b/hw/qdev.c | ||
|---|---|---|
| 85 | 85 |
DeviceState *dev; |
| 86 | 86 |
|
| 87 | 87 |
assert(bus->info == info->bus_info); |
| 88 |
dev = qemu_mallocz(info->size);
|
|
| 88 |
dev = g_malloc0(info->size);
|
|
| 89 | 89 |
dev->info = info; |
| 90 | 90 |
dev->parent_bus = bus; |
| 91 | 91 |
qdev_prop_set_defaults(dev, dev->info->props); |
| ... | ... | |
| 408 | 408 |
prop->info->free(dev, prop); |
| 409 | 409 |
} |
| 410 | 410 |
} |
| 411 |
qemu_free(dev);
|
|
| 411 |
g_free(dev);
|
|
| 412 | 412 |
} |
| 413 | 413 |
|
| 414 | 414 |
void qdev_machine_creation_done(void) |
| ... | ... | |
| 750 | 750 |
|
| 751 | 751 |
if (name) {
|
| 752 | 752 |
/* use supplied name */ |
| 753 |
bus->name = qemu_strdup(name);
|
|
| 753 |
bus->name = g_strdup(name);
|
|
| 754 | 754 |
} else if (parent && parent->id) {
|
| 755 | 755 |
/* parent device has id -> use it for bus name */ |
| 756 | 756 |
len = strlen(parent->id) + 16; |
| 757 |
buf = qemu_malloc(len);
|
|
| 757 |
buf = g_malloc(len);
|
|
| 758 | 758 |
snprintf(buf, len, "%s.%d", parent->id, parent->num_child_bus); |
| 759 | 759 |
bus->name = buf; |
| 760 | 760 |
} else {
|
| 761 | 761 |
/* no id -> use lowercase bus type for bus name */ |
| 762 | 762 |
len = strlen(info->name) + 16; |
| 763 |
buf = qemu_malloc(len);
|
|
| 763 |
buf = g_malloc(len);
|
|
| 764 | 764 |
len = snprintf(buf, len, "%s.%d", info->name, |
| 765 | 765 |
parent ? parent->num_child_bus : 0); |
| 766 | 766 |
for (i = 0; i < len; i++) |
| ... | ... | |
| 783 | 783 |
{
|
| 784 | 784 |
BusState *bus; |
| 785 | 785 |
|
| 786 |
bus = qemu_mallocz(info->size);
|
|
| 786 |
bus = g_malloc0(info->size);
|
|
| 787 | 787 |
bus->qdev_allocated = 1; |
| 788 | 788 |
qbus_create_inplace(bus, info, parent, name); |
| 789 | 789 |
return bus; |
| ... | ... | |
| 793 | 793 |
{
|
| 794 | 794 |
/* assign main_system_bus before qbus_create_inplace() |
| 795 | 795 |
* in order to make "if (bus != main_system_bus)" work */ |
| 796 |
main_system_bus = qemu_mallocz(system_bus_info.size);
|
|
| 796 |
main_system_bus = g_malloc0(system_bus_info.size);
|
|
| 797 | 797 |
main_system_bus->qdev_allocated = 1; |
| 798 | 798 |
qbus_create_inplace(main_system_bus, &system_bus_info, NULL, |
| 799 | 799 |
"main-system-bus"); |
| ... | ... | |
| 813 | 813 |
assert(bus != main_system_bus); /* main_system_bus is never freed */ |
| 814 | 814 |
qemu_unregister_reset(qbus_reset_all_fn, bus); |
| 815 | 815 |
} |
| 816 |
qemu_free((void*)bus->name);
|
|
| 816 |
g_free((void*)bus->name);
|
|
| 817 | 817 |
if (bus->qdev_allocated) {
|
| 818 |
qemu_free(bus);
|
|
| 818 |
g_free(bus);
|
|
| 819 | 819 |
} |
| 820 | 820 |
} |
| 821 | 821 |
|
| ... | ... | |
| 935 | 935 |
if (dev->parent_bus->info->get_fw_dev_path) {
|
| 936 | 936 |
d = dev->parent_bus->info->get_fw_dev_path(dev); |
| 937 | 937 |
l += snprintf(p + l, size - l, "%s", d); |
| 938 |
qemu_free(d);
|
|
| 938 |
g_free(d);
|
|
| 939 | 939 |
} else {
|
| 940 | 940 |
l += snprintf(p + l, size - l, "%s", dev->info->name); |
| 941 | 941 |
} |
Also available in: Unified diff