From patchwork Wed Sep 25 12:57:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 277836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 912FD2C00CE for ; Wed, 25 Sep 2013 23:03:06 +1000 (EST) Received: from localhost ([::1]:52400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOokB-000154-S3 for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 09:03:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOoft-0002vO-B9 for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOofn-00006q-Gb for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:58:37 -0400 Received: from mail-qe0-x22b.google.com ([2607:f8b0:400d:c02::22b]:55447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOofn-00006b-CQ; Wed, 25 Sep 2013 08:58:31 -0400 Received: by mail-qe0-f43.google.com with SMTP id gh4so4049727qeb.2 for ; Wed, 25 Sep 2013 05:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=fvQhMi3V8FFo77pxvSCzqmv3kRxyURkAyAt4VI3nHMA=; b=088HRy3zsoCthlRNOKhl0nZUAy/m72HnSeqEHO6g9cbjgJFsDJSpndF+iUJxw4CgZE AQ49HNqHQNEFJroUGiP3V2wbMW3RMhF2tNAjthBQ18ZvIo4bDFRGUjpUidOAw1u/B1hy Fh5TKcVZvAiFBodYqQZjsFeTpbOZZM2WOfWCz6Z2rN2Cf2y+yw9muJ23vNXu4g+DSD/3 FvsQaCrGtuFHbRnivn36PMzarPuvq0RUy4xQORIXSSQohry8Y1U6KRdJp9Vwn3dhFjE+ idy9L9lFl8lTtBDcBWQsyCLP0A5APiRApIxh3rqFNB0tCVt8lp6OcIe50QFdyqmpmi59 DUSw== X-Received: by 10.224.171.196 with SMTP id i4mr37555565qaz.38.1380113910803; Wed, 25 Sep 2013 05:58:30 -0700 (PDT) Received: from loki.morrigu.org ([70.114.130.150]) by mx.google.com with ESMTPSA id g2sm65250216qaf.12.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 05:58:30 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 25 Sep 2013 07:57:29 -0500 Message-Id: <1380113886-16845-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c02::22b Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 01/38] block: ensure bdrv_drain_all() works during bdrv_delete() 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: Stefan Hajnoczi In bdrv_delete() make sure to call bdrv_make_anon() *after* bdrv_close() so that the device is still seen by bdrv_drain_all() when iterating bdrv_states. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi (cherry picked from commit e1b5c52e04d04bb93546c6e37e8884889d047cb1) Signed-off-by: Michael Roth --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 01b66d8..d5ce8d3 100644 --- a/block.c +++ b/block.c @@ -1606,11 +1606,11 @@ void bdrv_delete(BlockDriverState *bs) assert(!bs->job); assert(!bs->in_use); + bdrv_close(bs); + /* remove from list, if necessary */ bdrv_make_anon(bs); - bdrv_close(bs); - g_free(bs); }