From patchwork Fri Mar 22 17:41:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 230222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F1392C00CB for ; Sat, 23 Mar 2013 04:44:08 +1100 (EST) Received: from localhost ([::1]:56897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ60c-0003u6-RK for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 13:44:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ5yN-0000gR-MU for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ5yK-0001Nh-T6 for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ5yK-0001NI-Kp for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:44 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MHfhhJ016117 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 22 Mar 2013 13:41:43 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-103.ams2.redhat.com [10.36.116.103]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2MHfQDp002071; Fri, 22 Mar 2013 13:41:42 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 22 Mar 2013 18:41:19 +0100 Message-Id: <1363974083-28440-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1363974083-28440-1-git-send-email-kwolf@redhat.com> References: <1363974083-28440-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 10/14] block: Rename variable to avoid shadowing 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 bdrv_open() uses two different variables called options. Rename one of them to avoid confusion and to allow the outer one to be accessed everywhere. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 8a95a28..2c17a34 100644 --- a/block.c +++ b/block.c @@ -896,7 +896,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, BlockDriverState *bs1; int64_t total_size; BlockDriver *bdrv_qcow2; - QEMUOptionParameter *options; + QEMUOptionParameter *create_options; char backing_filename[PATH_MAX]; /* if snapshot, we create a temporary backing file and open it @@ -928,17 +928,19 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, } bdrv_qcow2 = bdrv_find_format("qcow2"); - options = parse_option_parameters("", bdrv_qcow2->create_options, NULL); + create_options = parse_option_parameters("", bdrv_qcow2->create_options, + NULL); - set_option_parameter_int(options, BLOCK_OPT_SIZE, total_size); - set_option_parameter(options, BLOCK_OPT_BACKING_FILE, backing_filename); + set_option_parameter_int(create_options, BLOCK_OPT_SIZE, total_size); + set_option_parameter(create_options, BLOCK_OPT_BACKING_FILE, + backing_filename); if (drv) { - set_option_parameter(options, BLOCK_OPT_BACKING_FMT, + set_option_parameter(create_options, BLOCK_OPT_BACKING_FMT, drv->format_name); } - ret = bdrv_create(bdrv_qcow2, tmp_filename, options); - free_option_parameters(options); + ret = bdrv_create(bdrv_qcow2, tmp_filename, create_options); + free_option_parameters(create_options); if (ret < 0) { goto fail; }