diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 6 | ||||
| -rw-r--r-- | block/vvfat.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index b96323f658..bc1f071354 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -152,7 +152,6 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, { BlockBackend *blk; BlockDriverState *bs; - int ret; blk = blk_new(errp); if (!blk) { @@ -160,9 +159,8 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, return NULL; } - bs = NULL; - ret = bdrv_open(&bs, filename, reference, options, flags, errp); - if (ret < 0) { + bs = bdrv_open(filename, reference, options, flags, errp); + if (!bs) { blk_unref(blk); return NULL; } diff --git a/block/vvfat.c b/block/vvfat.c index 3e484a1dcc..a39dbe67e2 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2998,12 +2998,12 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) goto err; } - s->qcow = NULL; options = qdict_new(); qdict_put(options, "driver", qstring_from_str("qcow")); - ret = bdrv_open(&s->qcow, s->qcow_filename, NULL, options, - BDRV_O_RDWR | BDRV_O_NO_FLUSH, errp); - if (ret < 0) { + s->qcow = bdrv_open(s->qcow_filename, NULL, options, + BDRV_O_RDWR | BDRV_O_NO_FLUSH, errp); + if (!s->qcow) { + ret = -EINVAL; goto err; } |