From patchwork Tue Jan 12 00:36:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 566229 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 501D01402A1 for ; Tue, 12 Jan 2016 11:36:54 +1100 (AEDT) Received: from localhost ([::1]:57412 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aImx9-0002Kh-Tr for incoming@patchwork.ozlabs.org; Mon, 11 Jan 2016 19:36:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aImwh-0001R2-Ge for qemu-devel@nongnu.org; Mon, 11 Jan 2016 19:36:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aImwg-0000BT-9H for qemu-devel@nongnu.org; Mon, 11 Jan 2016 19:36:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aImwb-00008l-Dg; Mon, 11 Jan 2016 19:36:17 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 12EDCC09FAA8; Tue, 12 Jan 2016 00:36:17 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-163.bos.redhat.com [10.18.17.163]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0C0aEEX030934; Mon, 11 Jan 2016 19:36:16 -0500 From: John Snow To: qemu-block@nongnu.org Date: Mon, 11 Jan 2016 19:36:09 -0500 Message-Id: <1452558972-20316-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1452558972-20316-1-git-send-email-jsnow@redhat.com> References: <1452558972-20316-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, jcody@redhat.com, John Snow , armbru@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/5] block: Allow stream_start to return job references 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 stream_start now picks up a reference for its return value, a copy of the job started. callers are responsible for putting it down when they are done with it. This removes a minor reference to bs->job in qmp_block_stream, for a simple tracing function. Signed-off-by: John Snow --- block/stream.c | 8 +++++--- blockdev.c | 8 +++++--- include/block/block_int.h | 9 +++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/block/stream.c b/block/stream.c index 25af7ef..1dfeac0 100644 --- a/block/stream.c +++ b/block/stream.c @@ -213,7 +213,7 @@ static const BlockJobDriver stream_job_driver = { .set_speed = stream_set_speed, }; -void stream_start(BlockDriverState *bs, BlockDriverState *base, +BlockJob *stream_start(BlockDriverState *bs, BlockDriverState *base, const char *backing_file_str, int64_t speed, BlockdevOnError on_error, BlockCompletionFunc *cb, @@ -225,19 +225,21 @@ void stream_start(BlockDriverState *bs, BlockDriverState *base, on_error == BLOCKDEV_ON_ERROR_ENOSPC) && (!bs->blk || !blk_iostatus_is_enabled(bs->blk))) { error_setg(errp, QERR_INVALID_PARAMETER, "on-error"); - return; + return NULL; } s = block_job_create(&stream_job_driver, bs, speed, cb, opaque, errp); if (!s) { - return; + return NULL; } s->base = base; s->backing_file_str = g_strdup(backing_file_str); s->on_error = on_error; + block_job_ref(&s->common); s->common.co = qemu_coroutine_create(stream_run); trace_stream_start(bs, base, s, s->common.co, opaque); qemu_coroutine_enter(s->common.co, s); + return &s->common; } diff --git a/blockdev.c b/blockdev.c index d31bb03..f66cac8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2884,6 +2884,7 @@ void qmp_block_stream(const char *device, BlockBackend *blk; BlockDriverState *bs; BlockDriverState *base_bs = NULL; + BlockJob *job; AioContext *aio_context; Error *local_err = NULL; const char *base_name = NULL; @@ -2933,14 +2934,15 @@ void qmp_block_stream(const char *device, /* backing_file string overrides base bs filename */ base_name = has_backing_file ? backing_file : base_name; - stream_start(bs, base_bs, base_name, has_speed ? speed : 0, - on_error, block_job_cb, bs, &local_err); + job = stream_start(bs, base_bs, base_name, has_speed ? speed : 0, + on_error, block_job_cb, bs, &local_err); if (local_err) { error_propagate(errp, local_err); goto out; } - trace_qmp_block_stream(bs, bs->job); + trace_qmp_block_stream(bs, job); + block_job_unref(job); out: aio_context_release(aio_context); diff --git a/include/block/block_int.h b/include/block/block_int.h index a68c7dc..ea3b06b 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -597,10 +597,11 @@ int is_windows_drive(const char *filename); * streaming job, the backing file of @bs will be changed to * @base_id in the written image and to @base in the live BlockDriverState. */ -void stream_start(BlockDriverState *bs, BlockDriverState *base, - const char *base_id, int64_t speed, BlockdevOnError on_error, - BlockCompletionFunc *cb, - void *opaque, Error **errp); +BlockJob *stream_start(BlockDriverState *bs, BlockDriverState *base, + const char *base_id, int64_t speed, + BlockdevOnError on_error, + BlockCompletionFunc *cb, + void *opaque, Error **errp); /** * commit_start: