proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-16 02:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blkverify: Employ error parameter

Browse Source 
Make use of the error parameter in blkverify_open.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2013-10-10 15:44:04 +02:00 committed by Kevin Wolf
parent 10ffa72fae
commit ca2884087a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/blkverify.c
View File

@ -128,8 +128,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
opts = qemu_opts_create_nofail(&runtime_opts); opts = qemu_opts_create_nofail(&runtime_opts);
qemu_opts_absorb_qdict(opts, options, &local_err); qemu_opts_absorb_qdict(opts, options, &local_err);
if (error_is_set(&local_err)) { if (error_is_set(&local_err)) {
qerror_report_err(local_err); error_propagate(errp, local_err);
error_free(local_err);
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
@ -137,20 +136,21 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
/* Parse the raw image filename */ /* Parse the raw image filename */
raw = qemu_opt_get(opts, "x-raw"); raw = qemu_opt_get(opts, "x-raw");
if (raw == NULL) { if (raw == NULL) {
error_setg(errp, "Could not retrieve raw image filename");
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
ret = bdrv_file_open(&bs->file, raw, NULL, flags, &local_err); ret = bdrv_file_open(&bs->file, raw, NULL, flags, &local_err);
if (ret < 0) { if (ret < 0) {
qerror_report_err(local_err); error_propagate(errp, local_err);
error_free(local_err);
goto fail; goto fail;
} }
/* Open the test file */ /* Open the test file */
filename = qemu_opt_get(opts, "x-image"); filename = qemu_opt_get(opts, "x-image");
if (filename == NULL) { if (filename == NULL) {
error_setg(errp, "Could not retrieve test image filename");
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
@ -158,8 +158,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
s->test_file = bdrv_new(""); s->test_file = bdrv_new("");
ret = bdrv_open(s->test_file, filename, NULL, flags, NULL, &local_err); ret = bdrv_open(s->test_file, filename, NULL, flags, NULL, &local_err);
if (ret < 0) { if (ret < 0) {
qerror_report_err(local_err); error_propagate(errp, local_err);
error_free(local_err);
bdrv_unref(s->test_file); bdrv_unref(s->test_file);
s->test_file = NULL; s->test_file = NULL;
goto fail; goto fail;