From patchwork Thu Mar 17 15:35:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 8612341 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0DA82C0553 for ; Thu, 17 Mar 2016 15:37:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 228A020145 for ; Thu, 17 Mar 2016 15:37:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 280E82034F for ; Thu, 17 Mar 2016 15:37:25 +0000 (UTC) Received: from localhost ([::1]:35961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agZzI-0000ox-K1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 11:37:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agZz7-0000lb-Bn for qemu-devel@nongnu.org; Thu, 17 Mar 2016 11:37:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agZz3-00035E-9N for qemu-devel@nongnu.org; Thu, 17 Mar 2016 11:37:13 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:56790 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agZz3-0002y0-3P; Thu, 17 Mar 2016 11:37:09 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DeAgC2zepW/5tjdVteGQEBAhIBAYMUgUGmGAUBgQ8BkEiCDwENgW+GDQKBNjgUAQEBAQEBAWQnhEIBAQQnUhA/EjwbGYgrAcBnAQEIIIVWgkOHUYNuBYdZj3uIYYUgjwZEhWKIXR4BAUKCAxkUgTdoimMBAQE X-IPAS-Result: A2DeAgC2zepW/5tjdVteGQEBAhIBAYMUgUGmGAUBgQ8BkEiCDwENgW+GDQKBNjgUAQEBAQEBAWQnhEIBAQQnUhA/EjwbGYgrAcBnAQEIIIVWgkOHUYNuBYdZj3uIYYUgjwZEhWKIXR4BAUKCAxkUgTdoimMBAQE X-IronPort-AV: E=Sophos;i="5.24,350,1454972400"; d="scan'208";a="99267262" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 17 Mar 2016 16:36:29 +0100 Received: from dsl-hkibrasgw4-50df50-201.dhcp.inet.fi ([80.223.80.201] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim) id 1agZyO-00089V-Kw; Thu, 17 Mar 2016 16:36:28 +0100 Received: from berto by perseus.local with local (Exim 4.86_2) (envelope-from ) id 1agZyB-0007BA-C7; Thu, 17 Mar 2016 17:36:15 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 17 Mar 2016 17:35:50 +0200 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Cc: Alberto Garcia , qemu-block@nongnu.org Subject: [Qemu-devel] [PATCH 1/1] block: never cancel a streaming job without running stream_complete() 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need to call stream_complete() in order to do all the necessary clean-ups, even if there's an early failure. At the moment it's only useful to make sure that s->backing_file_str is not leaked, but it will become more important if we introduce support for streaming to any intermediate node. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi --- block/stream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/block/stream.c b/block/stream.c index cafaa07..eea3938 100644 --- a/block/stream.c +++ b/block/stream.c @@ -89,21 +89,21 @@ static void coroutine_fn stream_run(void *opaque) StreamCompleteData *data; BlockDriverState *bs = s->common.bs; BlockDriverState *base = s->base; - int64_t sector_num, end; + int64_t sector_num = 0; + int64_t end = -1; int error = 0; int ret = 0; int n = 0; void *buf; if (!bs->backing) { - block_job_completed(&s->common, 0); - return; + goto out; } s->common.len = bdrv_getlength(bs); if (s->common.len < 0) { - block_job_completed(&s->common, s->common.len); - return; + ret = s->common.len; + goto out; } end = s->common.len >> BDRV_SECTOR_BITS; @@ -190,6 +190,7 @@ wait: qemu_vfree(buf); +out: /* Modify backing chain and close BDSes in main loop */ data = g_malloc(sizeof(*data)); data->ret = ret;