From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sz7Sb-0005Ne-Tv for qemu-devel@nongnu.org; Wed, 08 Aug 2012 10:42:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sz7SW-0000V3-CQ for qemu-devel@nongnu.org; Wed, 08 Aug 2012 10:42:09 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:57238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sz7SV-0000Uh-W8 for qemu-devel@nongnu.org; Wed, 08 Aug 2012 10:42:04 -0400 Message-ID: <50227AB9.7010206@msgid.tls.msk.ru> Date: Wed, 08 Aug 2012 18:42:01 +0400 From: Michael Tokarev MIME-Version: 1.0 References: <50225901.7040101@msgid.tls.msk.ru> <50225A21.6070208@msgid.tls.msk.ru> <50225DEF.1060206@redhat.com> <50226512.1090705@msgid.tls.msk.ru> In-Reply-To: <50226512.1090705@msgid.tls.msk.ru> Content-Type: multipart/mixed; boundary="------------080900090602060509030507" Subject: Re: [Qemu-devel] commit da57febfed "qdev: give all devices a canonical path" broke usb_del List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Peter Maydell , Anthony Liguori , qemu-devel This is a multi-part message in MIME format. --------------080900090602060509030507 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 08.08.2012 17:09, Michael Tokarev wrote: [] > Something similar should be applied to 1.1-stable. FWIW, some > changes are not needed there. Cherry-pick to stable-1.1 removes the two unneeded hunks. This is what I plan to include into debian package. It fixes the original usb_del issue, and I didn't find new regressions so far - tried a few device_del and similar. Should it go to qemu/stable-1.1 as well? Thank you! /mjt --------------080900090602060509030507 Content-Type: text/x-patch; name="qom:-object_delete-should-unparent-the-object-first.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="qom:-object_delete-should-unparent-the-object-first.diff" Author: Paolo Bonzini Date: Wed Aug 8 14:39:11 2012 +0200 Bug-Debian: http://bugs.debian.org/684282 Comment: cherry-picked from qemu/master to stable-1.1 (mjt) qom: object_delete should unparent the object first object_deinit is only called when the reference count goes to zero, and yet tries to do an object_unparent. Now, object_unparent either does nothing or it will decrease the reference count. Because we know the reference count is zero, the object_unparent call in object_deinit is useless. Instead, we need to disconnect the object from its parent just before we remove the last reference apart from the parent's. This happens in object_delete. Once we do this, all calls to object_unparent peppered through QEMU can go away. Signed-off-by: Paolo Bonzini Signed-off-by: Michael Tokarev diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 0345490..585da4e 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -299,7 +299,6 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) if (pc->no_hotplug) { slot_free = false; } else { - object_unparent(OBJECT(dev)); qdev_free(qdev); } } diff --git a/hw/qdev.c b/hw/qdev.c index 6a8f6bd..9bb1c6b 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -240,7 +240,6 @@ void qbus_reset_all_fn(void *opaque) int qdev_simple_unplug_cb(DeviceState *dev) { /* just zap it */ - object_unparent(OBJECT(dev)); qdev_free(dev); return 0; } diff --git a/hw/xen_platform.c b/hw/xen_platform.c index 0214f37..84221df 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -87,9 +87,6 @@ static void unplug_nic(PCIBus *b, PCIDevice *d) { if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_NETWORK_ETHERNET) { - /* Until qdev_free includes a call to object_unparent, we call it here - */ - object_unparent(&d->qdev.parent_obj); qdev_free(&d->qdev); } } diff --git a/qom/object.c b/qom/object.c index 6f839ad..58dd886 100644 --- a/qom/object.c +++ b/qom/object.c @@ -347,8 +347,6 @@ static void object_deinit(Object *obj, TypeImpl *type) if (type_has_parent(type)) { object_deinit(obj, type_get_parent(type)); } - - object_unparent(obj); } void object_finalize(void *data) @@ -385,8 +383,9 @@ Object *object_new(const char *typename) void object_delete(Object *obj) { + object_unparent(obj); + g_assert(obj->ref == 1); object_unref(obj); - g_assert(obj->ref == 0); g_free(obj); } --------------080900090602060509030507--