diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-12 17:52:20 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-02-26 14:49:31 +0100 |
| commit | f43e47dbf6de24db20ec9b588bb6cc762093dd69 (patch) | |
| tree | e6236f3afaabde624458eab11e8daaa7e0dd4878 /block | |
| parent | 6be4194b9215ed29f258543ce34a1b4b2003864d (diff) | |
QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use
qemu_opt_set() is a wrapper around qemu_opt_set() that reports the
error with qerror_report_err().
Most of its users assume the function can't fail. Make them use
qemu_opt_set_err() with &error_abort, so that should the assumption
ever break, it'll break noisily.
Just two users remain, in util/qemu-config.c. Switch them to
qemu_opt_set_err() as well, then rename qemu_opt_set_err() to
qemu_opt_set().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 3 | ||||
| -rw-r--r-- | block/vvfat.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 772087420f..50e0a947df 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1859,7 +1859,8 @@ static int qcow2_create2(const char *filename, int64_t total_size, qemu_opt_set_number(opts, BLOCK_OPT_SIZE, aligned_total_size + meta_size, &error_abort); - qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_lookup[prealloc]); + qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_lookup[prealloc], + &error_abort); } ret = bdrv_create_file(filename, opts, &local_err); diff --git a/block/vvfat.c b/block/vvfat.c index 5e32d77362..9be632f404 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2926,7 +2926,7 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) opts = qemu_opts_create(bdrv_qcow->create_opts, NULL, 0, &error_abort); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512, &error_abort); - qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:"); + qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:", &error_abort); ret = bdrv_create(bdrv_qcow, s->qcow_filename, opts, errp); qemu_opts_del(opts); |