block: Rename variable to avoid shadowing
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 <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
6963a30d82
commit
08b392e151
16
block.c
16
block.c
|
@ -896,7 +896,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options,
|
||||||
BlockDriverState *bs1;
|
BlockDriverState *bs1;
|
||||||
int64_t total_size;
|
int64_t total_size;
|
||||||
BlockDriver *bdrv_qcow2;
|
BlockDriver *bdrv_qcow2;
|
||||||
QEMUOptionParameter *options;
|
QEMUOptionParameter *create_options;
|
||||||
char backing_filename[PATH_MAX];
|
char backing_filename[PATH_MAX];
|
||||||
|
|
||||||
/* if snapshot, we create a temporary backing file and open it
|
/* 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");
|
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_int(create_options, BLOCK_OPT_SIZE, total_size);
|
||||||
set_option_parameter(options, BLOCK_OPT_BACKING_FILE, backing_filename);
|
set_option_parameter(create_options, BLOCK_OPT_BACKING_FILE,
|
||||||
|
backing_filename);
|
||||||
if (drv) {
|
if (drv) {
|
||||||
set_option_parameter(options, BLOCK_OPT_BACKING_FMT,
|
set_option_parameter(create_options, BLOCK_OPT_BACKING_FMT,
|
||||||
drv->format_name);
|
drv->format_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = bdrv_create(bdrv_qcow2, tmp_filename, options);
|
ret = bdrv_create(bdrv_qcow2, tmp_filename, create_options);
|
||||||
free_option_parameters(options);
|
free_option_parameters(create_options);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue