Commit 87ea75d5 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Luiz Capitulino
Browse files

qemu-option: Remove qemu_opts_create_nofail 



This is a boiler-plate _nofail variant of qemu_opts_create. Remove and
use error_abort in call sites.

null/0 arguments needs to be added for the id and fail_if_exists fields
in affected callsites due to argument inconsistency between the normal and
no_fail variants.

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 00b81053

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    const char *filename, *config;

    int ret;



    opts = qemu_opts_create_nofail(&runtime_opts);

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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

block/blkverify.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, 
    const char *filename, *raw;

    int ret;



    opts = qemu_opts_create_nofail(&runtime_opts);

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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

block/curl.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, 
        return -EROFS;

    }



    opts = qemu_opts_create_nofail(&runtime_opts);

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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, 
    Error *local_err = NULL;

    const char *filename;



    opts = qemu_opts_create_nofail(&runtime_opts);

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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
        return -EINVAL;

    }



    opts = qemu_opts_create_nofail(&runtime_opts);

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

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

        qerror_report_err(local_err);