aboutsummaryrefslogtreecommitdiff
path: root/qemu-img.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-02-12 16:46:36 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-02-26 14:47:32 +0100
commit39101f2511f6adf1ae4380f8d729dba1213b9d7a (patch)
tree8c67d373be53ff4ad9d2a7e54112d4f0beb279be /qemu-img.c
parentcccb7967bdf19f9d31e65d2d07d4d311e07545c4 (diff)
QemuOpts: Convert qemu_opt_set_number() to Error, fix its use
Return the Error object instead of reporting it with qerror_report_err(). Change callers that assume the function can't fail to pass &error_abort, so that should the assumption ever break, it'll break noisily. Turns out all callers outside its unit test assume that. We could drop the Error ** argument, but that would make the interface less regular, so don't. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c
index fcdfb6719e..752eecb943 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1550,7 +1550,8 @@ static int img_convert(int argc, char **argv)
goto out;
}
- qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_sectors * 512);
+ qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_sectors * 512,
+ &error_abort);
ret = add_old_style_options(out_fmt, opts, out_baseimg, NULL);
if (ret < 0) {
goto out;