diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-08-26 19:47:48 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-09-14 16:51:36 +0200 |
| commit | e6641719fed794be8e0c48a69761528ae6c95ed9 (patch) | |
| tree | 2d468a3f566630548503d9aa83ecde588f165976 /block/vvfat.c | |
| parent | 2b750d9d261bda7f75b39dfc1e1e5f22502929d5 (diff) | |
| download | qemu-e6641719fed794be8e0c48a69761528ae6c95ed9.zip qemu-e6641719fed794be8e0c48a69761528ae6c95ed9.tar.gz qemu-e6641719fed794be8e0c48a69761528ae6c95ed9.tar.bz2 | |
block: Always pass NULL as drv for bdrv_open()
Change all callers of bdrv_open() to pass the driver name in the options
QDict instead of passing its BlockDriver pointer.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vvfat.c')
| -rw-r--r-- | block/vvfat.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index 2068697..bffe8ad 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2926,6 +2926,8 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) QemuOpts *opts = NULL; int ret; int size = sector2cluster(s, s->sector_count); + QDict *options; + s->used_clusters = calloc(size, 1); array_init(&(s->commits), sizeof(commit_t)); @@ -2956,9 +2958,11 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) } s->qcow = NULL; - ret = bdrv_open(&s->qcow, s->qcow_filename, NULL, 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_CACHE_WB | BDRV_O_NO_FLUSH, - bdrv_qcow, errp); + NULL, errp); if (ret < 0) { goto err; } |