From patchwork Tue Sep 2 10:01:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 385040 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 F1BF81400B9 for ; Tue, 2 Sep 2014 20:02:06 +1000 (EST) Received: from localhost ([::1]:36992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOkua-0000bP-TU for incoming@patchwork.ozlabs.org; Tue, 02 Sep 2014 06:02:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOktw-00081T-Ej for qemu-devel@nongnu.org; Tue, 02 Sep 2014 06:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOkto-0006bO-98 for qemu-devel@nongnu.org; Tue, 02 Sep 2014 06:01:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57694) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOkto-0006bB-1Z for qemu-devel@nongnu.org; Tue, 02 Sep 2014 06:01:16 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s82A1E8w022079 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 2 Sep 2014 06:01:15 -0400 Received: from localhost (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s82A1COD008136; Tue, 2 Sep 2014 06:01:13 -0400 From: Stefan Hajnoczi To: Date: Tue, 2 Sep 2014 11:01:03 +0100 Message-Id: <1409652063-32336-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1409652063-32336-1-git-send-email-stefanha@redhat.com> References: <1409652063-32336-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , jenelson@redhat.com, Fam Zheng , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v2 2/2] qemu-img: fix rebase src_cache option documentation 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 The src_cache option (-T) specifies the cache mode for backing files. It applies both the image's old backing file as well as the new backing file: ret = bdrv_open(&bs_old_backing, backing_name, NULL, NULL, src_flags, old_backing_drv, &local_err); if (ret) { ... } if (out_baseimg[0]) { bs_new_backing = bdrv_new("new_backing", &error_abort); ret = bdrv_open(&bs_new_backing, out_baseimg, NULL, NULL, src_flags, new_backing_drv, &local_err); if (ret) { ... } } The documentation only mentions the new backing file but it really applies to both. Suggested-by: Jeff Nelson Signed-off-by: Stefan Hajnoczi Reviewed-by: Max Reitz --- qemu-img.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img.texi b/qemu-img.texi index 4380d56..cc4668e 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -341,7 +341,7 @@ string), then the image is rebased onto no backing file (i.e. it will exist independently of any backing file). @var{cache} specifies the cache mode to be used for @var{filename}, whereas -@var{src_cache} specifies the cache mode for reading the new backing file. +@var{src_cache} specifies the cache mode for reading backing files. There are two different modes in which @code{rebase} can operate: @table @option