From patchwork Sun Jun 17 06:26:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ma, Stephen B." X-Patchwork-Id: 165324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8A7ABB7136 for ; Sun, 17 Jun 2012 16:30:18 +1000 (EST) Received: from localhost ([::1]:35018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sg903-0007lc-JX for incoming@patchwork.ozlabs.org; Sun, 17 Jun 2012 02:30:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sg8zv-0007jH-0l for qemu-devel@nongnu.org; Sun, 17 Jun 2012 02:30:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sg8zt-0001ZM-7h for qemu-devel@nongnu.org; Sun, 17 Jun 2012 02:30:06 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:35484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sg8zt-0001TR-0n for qemu-devel@nongnu.org; Sun, 17 Jun 2012 02:30:05 -0400 Received: from G9W0369G.americas.hpqcorp.net (g9w0369g.houston.hp.com [16.216.193.232]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by g1t0027.austin.hp.com (Postfix) with ESMTPS id C521538261; Sun, 17 Jun 2012 06:30:01 +0000 (UTC) Received: from G4W3007G.americas.hpqcorp.net (16.234.25.123) by G9W0369G.americas.hpqcorp.net (16.216.193.232) with Microsoft SMTP Server (TLS) id 14.2.283.4; Sun, 17 Jun 2012 06:26:35 +0000 Received: from G4W3209.americas.hpqcorp.net ([169.254.5.95]) by G4W3007G.americas.hpqcorp.net ([16.234.25.123]) with mapi id 14.02.0283.003; Sun, 17 Jun 2012 06:26:34 +0000 From: "Ma, Stephen B." To: "'Michael S. Tsirkin'" Thread-Topic: [PATCH] Fix for qemu crash on assertion error when adding PCI passthru device. Thread-Index: AQHNR/icy4vCfJOQeEK99mpqjBUNIJb2Wj6AgAWt8TA= Date: Sun, 17 Jun 2012 06:26:33 +0000 Message-ID: <36AF4B62444F4B4FB04EDD1FDAE1CF1D48899822@G4W3209.americas.hpqcorp.net> References: <36AF4B62444F4B4FB04EDD1FDAE1CF1D4889875E@G4W3209.americas.hpqcorp.net> <20120612082641.GC12356@redhat.com> In-Reply-To: <20120612082641.GC12356@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [16.216.12.11] MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 15.216.28.34 Cc: "'qemu-devel@nongnu.org'" Subject: Re: [Qemu-devel] [PATCH] Fix for qemu crash on assertion error when adding PCI passthru device. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Michael, Thanks for the review. I added the unparent to the qdev_free. --- hw/qdev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- 1.7.1 -----Original Message----- From: Michael S. Tsirkin [mailto:mst@redhat.com] Sent: Tuesday, June 12, 2012 1:27 AM To: Ma, Stephen B. Cc: 'qemu-devel@nongnu.org' Subject: Re: [PATCH] Fix for qemu crash on assertion error when adding PCI passthru device. On Tue, Jun 12, 2012 at 04:31:20AM +0000, Ma, Stephen B. wrote: > diff --git a/hw/qdev.c b/hw/qdev.c > index 6a8f6bd..d2dc28b 100644 > --- a/hw/qdev.c > +++ b/hw/qdev.c > @@ -139,7 +139,7 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) > /* Initialize a device. Device properties should be set before calling > this function. IRQs and MMIO regions should be connected/mapped after > calling this function. > - On failure, destroy the device and return negative value. > + On failure, return a negative value. > Return 0 on success. */ > int qdev_init(DeviceState *dev) > { Yes, I agree. qdev_init did now allocate the device so it should not free it. > @@ -150,7 +150,6 @@ int qdev_init(DeviceState *dev) > > rc = dc->init(dev); > if (rc < 0) { > - qdev_free(dev); > return rc; > } > Another thing we need to fix is unparent the device in qdev_free. diff --git a/hw/qdev.c b/hw/qdev.c index d2dc28b..ed1328d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -264,6 +264,7 @@ void qdev_init_nofail(DeviceState *dev) /* Unlink device from bus and free the structure. */ void qdev_free(DeviceState *dev) { + object_unparent(OBJECT(dev)); object_delete(OBJECT(dev)); }