[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on dc->init failure |
Date: |
Fri, 22 Jun 2012 19:33:24 -0500 |
From: Jason Baron <address@hidden>
While looking into hot-plugging bridges, I can create a qemu segfault via:
$ device_add pci-bridge
Bridge chassis not specified. Each bridge is required to be assigned a unique
chassis id > 0.
**
ERROR:qom/object.c:389:object_delete: assertion failed: (obj->ref == 0)
I'm proposing to fix this by adding a call to 'object_unparent()', before the
call to qdev_free(). I see there is already a precedent for this usage pattern
as
seen in qdev_simple_unplug_cb():
/* can be used as ->unplug() callback for the simple cases */
int qdev_simple_unplug_cb(DeviceState *dev)
{
/* just zap it */
object_unparent(OBJECT(dev));
qdev_free(dev);
return 0;
}
Signed-off-by: Jason Baron <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/qdev.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 6a8f6bd..af419b9 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -150,6 +150,7 @@ int qdev_init(DeviceState *dev)
rc = dc->init(dev);
if (rc < 0) {
+ object_unparent(OBJECT(dev));
qdev_free(dev);
return rc;
}
--
1.7.4.1
- [Qemu-devel] [PATCH stable-1.1 13/26] kvm: i8254: Fix conversion of in-kernel to userspace state, (continued)
- [Qemu-devel] [PATCH stable-1.1 13/26] kvm: i8254: Fix conversion of in-kernel to userspace state, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 14/26] qcow2: Silence false warning, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 15/26] monitor: Fix memory leak with readline completion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 16/26] configure: Fix build for some versions of glibc (9pfs), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 17/26] rtl8139: honor RxOverflow flag in can_receive method, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 18/26] ahci: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 21/26] pci_bridge_dev: fix error path in pci_bridge_dev_initfn(), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 22/26] qcow2: fix endianness conversion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 23/26] Prevent disk data loss when closing qemu, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 24/26] qcow2: fix autoclear image header update, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on dc->init failure,
Michael Roth <=
- [Qemu-devel] [PATCH stable-1.1 25/26] fdc: fix implied seek while there is no media in drive, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 19/26] intel-hda: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 26/26] build: install qmp-commands.txt, Michael Roth, 2012/06/22
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Stefano Stabellini, 2012/06/25
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Kevin Wolf, 2012/06/25