From nobody Sat Apr 12 05:12:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529073802359985.3985939838545; Fri, 15 Jun 2018 07:43:22 -0700 (PDT) Received: from localhost ([::1]:47257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTpwf-0008SH-I5 for importer@patchew.org; Fri, 15 Jun 2018 10:43:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTpbf-0006FH-AP for qemu-devel@nongnu.org; Fri, 15 Jun 2018 10:21:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTpbY-0003jY-Di for qemu-devel@nongnu.org; Fri, 15 Jun 2018 10:21:39 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55624 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fTpbO-0003Xu-DI; Fri, 15 Jun 2018 10:21:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E280287A81; Fri, 15 Jun 2018 14:21:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-70.ams2.redhat.com [10.36.117.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DB5563A51; Fri, 15 Jun 2018 14:21:21 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 15 Jun 2018 16:20:53 +0200 Message-Id: <20180615142108.27814-12-kwolf@redhat.com> In-Reply-To: <20180615142108.27814-1-kwolf@redhat.com> References: <20180615142108.27814-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 15 Jun 2018 14:21:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 15 Jun 2018 14:21:21 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 11/26] block: Clean up a misuse of qobject_to() in .bdrv_co_create_opts() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster The following pattern occurs in the .bdrv_co_create_opts() methods of parallels, qcow, qcow2, qed, vhdx and vpc: qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); qobject_unref(qdict); qdict =3D qobject_to(QDict, qobj); if (qdict =3D=3D NULL) { ret =3D -EINVAL; goto done; } v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); [...] ret =3D 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 Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/parallels.c | 9 ++++----- block/qcow.c | 9 ++++----- block/qcow2.c | 9 ++++----- block/qed.c | 9 ++++----- block/vhdx.c | 9 ++++----- block/vpc.c | 9 ++++----- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 695899fc4b..ceb7a15d62 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -616,7 +616,7 @@ static int coroutine_fn parallels_co_create_opts(const = char *filename, BlockdevCreateOptions *create_options =3D NULL; Error *local_err =3D NULL; BlockDriverState *bs =3D NULL; - QDict *qdict =3D NULL; + QDict *qdict; QObject *qobj; Visitor *v; int ret; @@ -654,14 +654,13 @@ static int coroutine_fn parallels_co_create_opts(cons= t char *filename, qdict_put_str(qdict, "file", bs->node_name); =20 qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); - qobject_unref(qdict); - qdict =3D qobject_to(QDict, qobj); - if (qdict =3D=3D NULL) { + if (!qobj) { ret =3D -EINVAL; goto done; } =20 - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + v =3D qobject_input_visitor_new_keyval(qobj); + qobject_unref(qobj); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 diff --git a/block/qcow.c b/block/qcow.c index 860b058240..2f81f081fd 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -946,7 +946,7 @@ static int coroutine_fn qcow_co_create_opts(const char = *filename, { BlockdevCreateOptions *create_options =3D NULL; BlockDriverState *bs =3D NULL; - QDict *qdict =3D NULL; + QDict *qdict; QObject *qobj; Visitor *v; const char *val; @@ -998,14 +998,13 @@ static int coroutine_fn qcow_co_create_opts(const cha= r *filename, qdict_put_str(qdict, "file", bs->node_name); =20 qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); - qobject_unref(qdict); - qdict =3D qobject_to(QDict, qobj); - if (qdict =3D=3D NULL) { + if (!qobj) { ret =3D -EINVAL; goto fail; } =20 - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + v =3D qobject_input_visitor_new_keyval(qobj); + qobject_unref(qobj); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 diff --git a/block/qcow2.c b/block/qcow2.c index 0a27afa2ef..8c338661db 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3080,7 +3080,7 @@ static int coroutine_fn qcow2_co_create_opts(const ch= ar *filename, QemuOpts *opt Error **errp) { BlockdevCreateOptions *create_options =3D NULL; - QDict *qdict =3D NULL; + QDict *qdict; QObject *qobj; Visitor *v; BlockDriverState *bs =3D NULL; @@ -3153,14 +3153,13 @@ static int coroutine_fn qcow2_co_create_opts(const = char *filename, QemuOpts *opt =20 /* Now get the QAPI type BlockdevCreateOptions */ qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); - qobject_unref(qdict); - qdict =3D qobject_to(QDict, qobj); - if (qdict =3D=3D NULL) { + if (!qobj) { ret =3D -EINVAL; goto finish; } =20 - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + v =3D qobject_input_visitor_new_keyval(qobj); + qobject_unref(qobj); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 diff --git a/block/qed.c b/block/qed.c index 88fa36d409..fcec760b26 100644 --- a/block/qed.c +++ b/block/qed.c @@ -722,7 +722,7 @@ static int coroutine_fn bdrv_qed_co_create_opts(const c= har *filename, Error **errp) { BlockdevCreateOptions *create_options =3D NULL; - QDict *qdict =3D NULL; + QDict *qdict; QObject *qobj; Visitor *v; BlockDriverState *bs =3D 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); =20 qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); - qobject_unref(qdict); - qdict =3D qobject_to(QDict, qobj); - if (qdict =3D=3D NULL) { + if (!qobj) { ret =3D -EINVAL; goto fail; } =20 - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + v =3D qobject_input_visitor_new_keyval(qobj); + qobject_unref(qobj); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 diff --git a/block/vhdx.c b/block/vhdx.c index 78b29d9fc7..f2aec3d2cd 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1965,7 +1965,7 @@ static int coroutine_fn vhdx_co_create_opts(const cha= r *filename, Error **errp) { BlockdevCreateOptions *create_options =3D NULL; - QDict *qdict =3D NULL; + QDict *qdict; QObject *qobj; Visitor *v; BlockDriverState *bs =3D NULL; @@ -2006,14 +2006,13 @@ static int coroutine_fn vhdx_co_create_opts(const c= har *filename, qdict_put_str(qdict, "file", bs->node_name); =20 qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); - qobject_unref(qdict); - qdict =3D qobject_to(QDict, qobj); - if (qdict =3D=3D NULL) { + if (!qobj) { ret =3D -EINVAL; goto fail; } =20 - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + v =3D qobject_input_visitor_new_keyval(qobj); + qobject_unref(qobj); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 diff --git a/block/vpc.c b/block/vpc.c index 16178e5a90..a9bb04149d 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -1081,7 +1081,7 @@ static int coroutine_fn vpc_co_create_opts(const char= *filename, QemuOpts *opts, Error **errp) { BlockdevCreateOptions *create_options =3D NULL; - QDict *qdict =3D NULL; + QDict *qdict; QObject *qobj; Visitor *v; BlockDriverState *bs =3D NULL; @@ -1120,14 +1120,13 @@ static int coroutine_fn vpc_co_create_opts(const ch= ar *filename, qdict_put_str(qdict, "file", bs->node_name); =20 qobj =3D qdict_crumple_for_keyval_qiv(qdict, errp); - qobject_unref(qdict); - qdict =3D qobject_to(QDict, qobj); - if (qdict =3D=3D NULL) { + if (!qobj) { ret =3D -EINVAL; goto fail; } =20 - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + v =3D qobject_input_visitor_new_keyval(qobj); + qobject_unref(qobj); visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 --=20 2.13.6