From patchwork Tue Mar 12 13:02:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 227019 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 2CB612C008E for ; Wed, 13 Mar 2013 00:03:22 +1100 (EST) Received: from localhost ([::1]:53199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFOrQ-0006sp-6j for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2013 09:03:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFOr8-0006pP-6m for qemu-devel@nongnu.org; Tue, 12 Mar 2013 09:03:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFOr2-0001Zx-2S for qemu-devel@nongnu.org; Tue, 12 Mar 2013 09:03:02 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:45249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFOr1-0001Zc-Pf for qemu-devel@nongnu.org; Tue, 12 Mar 2013 09:02:55 -0400 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Mar 2013 13:00:39 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Mar 2013 13:00:37 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id BAF3F17D802D for ; Tue, 12 Mar 2013 13:03:28 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2CD2e5m29163772 for ; Tue, 12 Mar 2013 13:02:40 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2CD2mF6016667 for ; Tue, 12 Mar 2013 07:02:49 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-122.boeblingen.de.ibm.com [9.152.224.122]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2CD2lDo016601; Tue, 12 Mar 2013 07:02:48 -0600 From: Cornelia Huck To: qemu-devel Date: Tue, 12 Mar 2013 14:02:46 +0100 Message-Id: <1363093367-506-2-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363093367-506-1-git-send-email-cornelia.huck@de.ibm.com> References: <1363093367-506-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031213-0342-0000-0000-0000046F7700 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.111 Cc: Blue Swirl , Christian Borntraeger , Anthony Liguori , Jens Freimann , =?UTF-8?q?Aur=C3=A9lien=20Jarno?= Subject: [Qemu-devel] [PATCH 1/2] virtio-ccw: remove qdev_unparent in unplug routing 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 From: Christian Borntraeger This patch fixes unplugging a virtio-ccw device. We no longer need to do that in virtio-ccw since common code does now proper handling. Signed-off-by: Christian Borntraeger Signed-off-by: Jens Freimann Signed-off-by: Cornelia Huck --- hw/s390x/virtio-ccw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a9cf703..06b9641 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -865,7 +865,6 @@ static int virtio_ccw_busdev_unplug(DeviceState *dev) css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, 1, 0); - object_unparent(OBJECT(dev)); qdev_free(dev); return 0; }