diff options
author | Markus Armbruster <armbru@redhat.com> | 2015-02-12 16:46:36 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-02-26 14:47:32 +0100 |
commit | 39101f2511f6adf1ae4380f8d729dba1213b9d7a (patch) | |
tree | 8c67d373be53ff4ad9d2a7e54112d4f0beb279be /block/qcow2.c | |
parent | cccb7967bdf19f9d31e65d2d07d4d311e07545c4 (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 'block/qcow2.c')
-rw-r--r-- | block/qcow2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 2ed8d95b1f..772087420f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1858,7 +1858,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, meta_size += nreftablee * sizeof(uint64_t); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, - aligned_total_size + meta_size); + aligned_total_size + meta_size, &error_abort); qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_lookup[prealloc]); } |