diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 01:28:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 01:28:54 +0000 |
| commit | 5efde22aa781d37df58f0060430f459491dcfd62 (patch) | |
| tree | 49fa5a0ded22f789863a85bc27e42d4165e442ec /block/vvfat.c | |
| parent | 0856579cac2f1dacecd847cfcd89680d26ff78f5 (diff) | |
| parent | b3adf5acb57dee14a74e57ab4f16cd1a83e5a7d2 (diff) | |
| download | qemu-5efde22aa781d37df58f0060430f459491dcfd62.zip qemu-5efde22aa781d37df58f0060430f459491dcfd62.tar.gz qemu-5efde22aa781d37df58f0060430f459491dcfd62.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-26' into staging
QemuOpts: Convert various setters to Error
# gpg: Signature made Thu Feb 26 13:56:43 2015 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-error-2015-02-26:
qtest: Use qemu_opt_set() instead of qemu_opts_parse()
pc: Use qemu_opt_set() instead of qemu_opts_parse()
qemu-sockets: Simplify setting numeric and boolean options
block: Simplify setting numeric options
qemu-img: Suppress unhelpful extra errors in convert, amend
QemuOpts: Propagate errors through opts_parse()
QemuOpts: Propagate errors through opts_do_parse()
QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use
block: Suppress unhelpful extra errors in bdrv_img_create()
qemu-img: Suppress unhelpful extra errors in convert, resize
QemuOpts: Convert qemu_opts_set() to Error, fix its use
QemuOpts: Convert qemu_opt_set_number() to Error, fix its use
QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/vvfat.c')
| -rw-r--r-- | block/vvfat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index a1a44f0..9be632f 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2924,8 +2924,9 @@ 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); - qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:"); + qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512, + &error_abort); + 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); |