motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'kwolf/for-anthony' into staging

Browse source 
Conflicts:
	hw/pc.c
This commit is contained in:
Anthony Liguori 2010-06-14 10:33:36 -05:00
commit a4673e2762
48 changed files with 916 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/qdev.c
View file

@ -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);
}