[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] block: Rename variable to avoid shadowing
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/14] block: Rename variable to avoid shadowing |
Date: |
Fri, 22 Mar 2013 18:41:19 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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;
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/14] Block patches, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 01/14] Revert "block: complete all IOs before .bdrv_truncate", Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 02/14] block: complete all IOs before resizing a device, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 04/14] block: Pass bdrv_file_open() options to block drivers, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 07/14] nbd: Remove unused functions, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 08/14] nbd: Accept -drive options for the network connection, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 05/14] qemu-socket: Make socket_optslist public, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 10/14] block: Rename variable to avoid shadowing,
Kevin Wolf <=
- [Qemu-devel] [PATCH 11/14] block: Make find_image_format safe with NULL filename, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 03/14] block: Add options QDict to bdrv_file_open() prototypes, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 14/14] nbd: Check against invalid option combinations, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 06/14] nbd: Keep hostname and port separate, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 09/14] block: Introduce .bdrv_parse_filename callback, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 12/14] block: Allow omitting the file name when using driver-specific options, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 13/14] nbd: Use default port if only host is specified, Kevin Wolf, 2013/03/22