From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC1RF-0004JY-Vy for qemu-devel@nongnu.org; Mon, 15 Oct 2018 07:53:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gC1RD-0002Eq-Op for qemu-devel@nongnu.org; Mon, 15 Oct 2018 07:53:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43734) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gC1RD-00020f-DL for qemu-devel@nongnu.org; Mon, 15 Oct 2018 07:53:31 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B4CAB31500AE for ; Mon, 15 Oct 2018 11:53:17 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FE4C2B584 for ; Mon, 15 Oct 2018 11:53:17 +0000 (UTC) From: Markus Armbruster Date: Mon, 15 Oct 2018 13:52:58 +0200 Message-Id: <20181015115309.17089-25-armbru@redhat.com> In-Reply-To: <20181015115309.17089-1-armbru@redhat.com> References: <20181015115309.17089-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 24/35] vl: Clean up error reporting in device_init_func() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Calling error_report() in a function that takes an Error ** argument is suspicious. device_init_func() does that, and then fails without setting an error. Its caller main(), via qemu_opts_foreach(), is fine with it, but clean it up anyway. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- vl.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index c5bc54f72b..c053117028 100644 --- a/vl.c +++ b/vl.c @@ -2222,12 +2222,10 @@ static int device_help_func(void *opaque, QemuOpt= s *opts, Error **errp) =20 static int device_init_func(void *opaque, QemuOpts *opts, Error **errp) { - Error *err =3D NULL; DeviceState *dev; =20 - dev =3D qdev_device_add(opts, &err); + dev =3D qdev_device_add(opts, errp); if (!dev) { - error_report_err(err); return -1; } object_unref(OBJECT(dev)); @@ -4491,10 +4489,8 @@ int main(int argc, char **argv, char **envp) =20 /* init generic devices */ rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE); - if (qemu_opts_foreach(qemu_find_opts("device"), - device_init_func, NULL, NULL)) { - exit(1); - } + qemu_opts_foreach(qemu_find_opts("device"), + device_init_func, NULL, &error_fatal); =20 cpu_synchronize_all_post_init(); =20 --=20 2.17.1