From patchwork Fri Feb 22 19:01:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 222615 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 962352C0297 for ; Sat, 23 Feb 2013 06:02:44 +1100 (EST) Received: from localhost ([::1]:37723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8xtK-00025u-Op for incoming@patchwork.ozlabs.org; Fri, 22 Feb 2013 14:02:42 -0500 Received: from eggs.gnu.org ([208.118.235.92]:48105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8xse-0000ZN-7u for qemu-devel@nongnu.org; Fri, 22 Feb 2013 14:02:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8xsc-0002TS-W6 for qemu-devel@nongnu.org; Fri, 22 Feb 2013 14:02:00 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:33510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8xsc-0002TH-Lg for qemu-devel@nongnu.org; Fri, 22 Feb 2013 14:01:58 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 22 Feb 2013 18:59:50 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 22 Feb 2013 18:59:45 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id D58E12190056 for ; Fri, 22 Feb 2013 19:03:05 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1MJ1ggr29425714 for ; Fri, 22 Feb 2013 19:01:43 GMT Received: from d06av05.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1MJ1p69028926 for ; Fri, 22 Feb 2013 12:01:51 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1MJ1pms028921; Fri, 22 Feb 2013 12:01:51 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id 44D491224437; Fri, 22 Feb 2013 20:01:51 +0100 (CET) From: Jens Freimann To: Alexander Graf Date: Fri, 22 Feb 2013 20:01:33 +0100 Message-Id: <1361559693-39396-4-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1361559693-39396-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1361559693-39396-1-git-send-email-jfrei@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13022218-5024-0000-0000-0000054926F7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.107 Cc: Cornelia Huck , Christian Borntraeger , Jens Freimann , qemu-devel Subject: [Qemu-devel] [PATCH 3/3] s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del 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 blockdev_mark_auto_del is already called in virtio-blk-exit. Remove the redundant call. Signed-off-by: Christian Borntraeger Signed-off-by: Jens Freimann --- 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 679afa6..228e73e 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -584,7 +584,6 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *dev) static int virtio_ccw_blk_exit(VirtioCcwDevice *dev) { virtio_blk_exit(dev->vdev); - blockdev_mark_auto_del(dev->blk.conf.bs); return virtio_ccw_exit(dev); }