motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Clean up a misuse of qobject_to() in .bdrv_co_create_opts()

Browse source 
The following pattern occurs in the .bdrv_co_create_opts() methods of
parallels, qcow, qcow2, qed, vhdx and vpc:

    qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
    qobject_unref(qdict);
    qdict = qobject_to(QDict, qobj);
    if (qdict == NULL) {
         ret = -EINVAL;
         goto done;
    }

    v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
    [...]
    ret = 0;
done:
    qobject_unref(qdict);
    [...]
    return ret;

If qobject_to() fails, we return failure without setting errp.  That's
wrong.  As far as I can tell, it cannot fail here.  Clean it up
anyway, by removing the useless conversion.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2018-06-14 21:14:32 +02:00 • committed by Kevin Wolf
parent 374c52467a
commit 92adf9dbcd
6 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
block/parallels.c
View file

@ -616,7 +616,7 @@ static int coroutine_fn parallels_co_create_opts(const char *filename,
BlockdevCreateOptions *create_options = NULL; BlockdevCreateOptions *create_options = NULL;
Error *local_err = NULL; Error *local_err = NULL;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
QDict *qdict = NULL; QDict *qdict;
QObject *qobj; QObject *qobj;
Visitor *v; Visitor *v;
int ret; int ret;
@ -654,14 +654,13 @@ static int coroutine_fn parallels_co_create_opts(const char *filename,
qdict_put_str(qdict, "file", bs->node_name); qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple_for_keyval_qiv(qdict, errp); qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
qobject_unref(qdict); if (!qobj) {
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto done; goto done;
} }
v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); v = qobject_input_visitor_new_keyval(qobj);
qobject_unref(qobj);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v); visit_free(v);

9
block/qcow.c
View file

@ -946,7 +946,7 @@ static int coroutine_fn qcow_co_create_opts(const char *filename,
{ {
BlockdevCreateOptions *create_options = NULL; BlockdevCreateOptions *create_options = NULL;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
QDict *qdict = NULL; QDict *qdict;
QObject *qobj; QObject *qobj;
Visitor *v; Visitor *v;
const char *val; const char *val;
@ -998,14 +998,13 @@ static int coroutine_fn qcow_co_create_opts(const char *filename,
qdict_put_str(qdict, "file", bs->node_name); qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple_for_keyval_qiv(qdict, errp); qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
qobject_unref(qdict); if (!qobj) {
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); v = qobject_input_visitor_new_keyval(qobj);
qobject_unref(qobj);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v); visit_free(v);

9
block/qcow2.c
View file

@ -3080,7 +3080,7 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt
Error **errp) Error **errp)
{ {
BlockdevCreateOptions *create_options = NULL; BlockdevCreateOptions *create_options = NULL;
QDict *qdict = NULL; QDict *qdict;
QObject *qobj; QObject *qobj;
Visitor *v; Visitor *v;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
@ -3153,14 +3153,13 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt
/* Now get the QAPI type BlockdevCreateOptions */ /* Now get the QAPI type BlockdevCreateOptions */
qobj = qdict_crumple_for_keyval_qiv(qdict, errp); qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
qobject_unref(qdict); if (!qobj) {
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto finish; goto finish;
} }
v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); v = qobject_input_visitor_new_keyval(qobj);
qobject_unref(qobj);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v); visit_free(v);

9
block/qed.c
View file

@ -722,7 +722,7 @@ static int coroutine_fn bdrv_qed_co_create_opts(const char *filename,
Error **errp) Error **errp)
{ {
BlockdevCreateOptions *create_options = NULL; BlockdevCreateOptions *create_options = NULL;
QDict *qdict = NULL; QDict *qdict;
QObject *qobj; QObject *qobj;
Visitor *v; Visitor *v;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
@ -764,14 +764,13 @@ static int coroutine_fn bdrv_qed_co_create_opts(const char *filename,
qdict_put_str(qdict, "file", bs->node_name); qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple_for_keyval_qiv(qdict, errp); qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
qobject_unref(qdict); if (!qobj) {
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); v = qobject_input_visitor_new_keyval(qobj);
qobject_unref(qobj);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v); visit_free(v);

9
block/vhdx.c
View file

@ -1965,7 +1965,7 @@ static int coroutine_fn vhdx_co_create_opts(const char *filename,
Error **errp) Error **errp)
{ {
BlockdevCreateOptions *create_options = NULL; BlockdevCreateOptions *create_options = NULL;
QDict *qdict = NULL; QDict *qdict;
QObject *qobj; QObject *qobj;
Visitor *v; Visitor *v;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
@ -2006,14 +2006,13 @@ static int coroutine_fn vhdx_co_create_opts(const char *filename,
qdict_put_str(qdict, "file", bs->node_name); qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple_for_keyval_qiv(qdict, errp); qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
qobject_unref(qdict); if (!qobj) {
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); v = qobject_input_visitor_new_keyval(qobj);
qobject_unref(qobj);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v); visit_free(v);

9
block/vpc.c
View file

@ -1081,7 +1081,7 @@ static int coroutine_fn vpc_co_create_opts(const char *filename,
QemuOpts *opts, Error **errp) QemuOpts *opts, Error **errp)
{ {
BlockdevCreateOptions *create_options = NULL; BlockdevCreateOptions *create_options = NULL;
QDict *qdict = NULL; QDict *qdict;
QObject *qobj; QObject *qobj;
Visitor *v; Visitor *v;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
@ -1120,14 +1120,13 @@ static int coroutine_fn vpc_co_create_opts(const char *filename,
qdict_put_str(qdict, "file", bs->node_name); qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple_for_keyval_qiv(qdict, errp); qobj = qdict_crumple_for_keyval_qiv(qdict, errp);
qobject_unref(qdict); if (!qobj) {
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); v = qobject_input_visitor_new_keyval(qobj);
qobject_unref(qobj);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v); visit_free(v);