From patchwork Mon Mar 11 15:52:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 226576 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 EE5FC2C02C4 for ; Tue, 12 Mar 2013 02:53:27 +1100 (EST) Received: from localhost ([::1]:49928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF52U-0004cp-85 for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2013 11:53:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF528-0004cS-Ps for qemu-devel@nongnu.org; Mon, 11 Mar 2013 11:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UF527-0001Em-Gg for qemu-devel@nongnu.org; Mon, 11 Mar 2013 11:53:04 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:47365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF527-0001EU-7F for qemu-devel@nongnu.org; Mon, 11 Mar 2013 11:53:03 -0400 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Mar 2013 15:50:50 -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; Mon, 11 Mar 2013 15:50:48 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6A14317D802D for ; Mon, 11 Mar 2013 15:53:38 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2BFqoS329425716 for ; Mon, 11 Mar 2013 15:52:50 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2BEjhOm001950 for ; Mon, 11 Mar 2013 10:45:43 -0400 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-122.boeblingen.de.ibm.com [9.152.224.122]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2BEjgMx001900; Mon, 11 Mar 2013 10:45:42 -0400 From: Cornelia Huck To: qemu-devel Date: Mon, 11 Mar 2013 16:52:55 +0100 Message-Id: <1363017177-27666-2-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363017177-27666-1-git-send-email-cornelia.huck@de.ibm.com> References: <1363017177-27666-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031115-0342-0000-0000-0000046D4587 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: Christian Borntraeger , Jens Freimann 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; }