From patchwork Fri Jul 1 15:51:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 9210109 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9613C60752 for ; Fri, 1 Jul 2016 15:57:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87A222853D for ; Fri, 1 Jul 2016 15:57:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C7182867A; Fri, 1 Jul 2016 15:57:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 28C812853D for ; Fri, 1 Jul 2016 15:57:20 +0000 (UTC) Received: from localhost ([::1]:34115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ0oh-00068u-C0 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Jul 2016 11:57:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ0kl-0000Lf-Kg for qemu-devel@nongnu.org; Fri, 01 Jul 2016 11:53:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ0kf-0004jo-I9 for qemu-devel@nongnu.org; Fri, 01 Jul 2016 11:53:14 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:41606 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ0kf-0004Xv-Am; Fri, 01 Jul 2016 11:53:09 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2D9AQAhkXZX/5tjdVtdHQGDIIFSjSqXOgYFAYEQkUGCD4F7hhgCgTA4FAEBAQEBAQFlJ4RNAgQnUhA/EjwbGYg0AcRCAQEIJ4VggkeHWoUPBY4BcIofjkSJS4VfSI9BHjaCBQMcgU9riHQBAQE X-IPAS-Result: A2D9AQAhkXZX/5tjdVtdHQGDIIFSjSqXOgYFAYEQkUGCD4F7hhgCgTA4FAEBAQEBAQFlJ4RNAgQnUhA/EjwbGYg0AcRCAQEIJ4VggkeHWoUPBY4BcIofjkSJS4VfSI9BHjaCBQMcgU9riHQBAQE X-IronPort-AV: E=Sophos;i="5.26,557,1459807200"; d="scan'208";a="146521271" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 01 Jul 2016 17:52:29 +0200 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1bJ0k1-0003i9-4I; Fri, 01 Jul 2016 17:52:29 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bJ0jl-0005PD-3j; Fri, 01 Jul 2016 18:52:13 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 18:51:59 +0300 Message-Id: X-Mailer: git-send-email 2.8.1 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 Subject: [Qemu-devel] [PATCH v3 01/11] stream: Fix prototype of stream_start() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Jeff Cody , Max Reitz , John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 'stream-start' has a parameter called 'backing-file', which is the string to be written to bs->backing when the job finishes. In the stream_start() implementation it is called 'backing_file_str', but it the prototype in the header file it is called 'base_id'. This patch fixes it so the name is the same in both cases and is consistent with other cases (like commit_start()). Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf --- include/block/block_int.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 2057156..549b1ed 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -625,8 +625,8 @@ int is_windows_drive(const char *filename); * @bs: Block device to operate on. * @base: Block device that will become the new base, or %NULL to * flatten the whole backing file chain onto @bs. - * @base_id: The file name that will be written to @bs as the new - * backing file if the job completes. Ignored if @base is %NULL. + * @backing_file_str: The file name that will be written to @bs as the + * the new backing file if the job completes. Ignored if @base is %NULL. * @speed: The maximum speed, in bytes per second, or 0 for unlimited. * @on_error: The action to take upon error. * @cb: Completion function for the job. @@ -637,11 +637,12 @@ int is_windows_drive(const char *filename); * in @bs, but allocated in any image between @base and @bs (both * exclusive) will be written to @bs. At the end of a successful * streaming job, the backing file of @bs will be changed to - * @base_id in the written image and to @base in the live BlockDriverState. + * @backing_file_str 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, + const char *backing_file_str, int64_t speed, + BlockdevOnError on_error, BlockCompletionFunc *cb, void *opaque, Error **errp); /**