Commit 39101f25 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent cccb7967

block.c

+3 −3
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) 


    opts = qemu_opts_create(bdrv_qcow2.create_opts, NULL, 0,

                            &error_abort);

    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size);

    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size, &error_abort);

    ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, &local_err);

    qemu_opts_del(opts);

    if (ret < 0) {
@@ -5649,7 +5649,7 @@ void bdrv_img_create(const char *filename, const char *fmt, 


    /* Create parameter list with default values */

    opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);

    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size);

    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, img_size, &error_abort);



    /* Parse -o options */

    if (options) {
@@ -5731,7 +5731,7 @@ void bdrv_img_create(const char *filename, const char *fmt, 
                goto out;

            }



            qemu_opt_set_number(opts, BLOCK_OPT_SIZE, size);

            qemu_opt_set_number(opts, BLOCK_OPT_SIZE, size, &error_abort);



            bdrv_unref(bs);

        } else {

block/nbd.c

+2 −1
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ static void nbd_config(BDRVNBDState *s, QDict *options, char **export, 
    }



    if (!qemu_opt_get(s->socket_opts, "port")) {

        qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT);

        qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT,

                            &error_abort);

    }



    *export = g_strdup(qdict_get_try_str(options, "export"));

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -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]);

    }

block/vvfat.c

+2 −1
Original line number Diff line number Diff line
@@ -2924,7 +2924,8 @@ 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_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512,

                        &error_abort);

    qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:");



    ret = bdrv_create(bdrv_qcow, s->qcow_filename, opts, errp);

include/qemu/option.h

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value, 
                      Error **errp);

void qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val,

                       Error **errp);

int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val);

void qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val,

                         Error **errp);

typedef int (*qemu_opt_loopfunc)(const char *name, const char *value, void *opaque);

int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,

                     int abort_on_failure);