From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gChAo-0008H7-1E for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gChAc-00017L-Vs for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gChAc-00014i-HD for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 40B0F30001EA for ; Wed, 17 Oct 2018 08:27:09 +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 0701580FD1 for ; Wed, 17 Oct 2018 08:27:09 +0000 (UTC) From: Markus Armbruster Date: Wed, 17 Oct 2018 10:26:45 +0200 Message-Id: <20181017082702.5581-22-armbru@redhat.com> In-Reply-To: <20181017082702.5581-1-armbru@redhat.com> References: <20181017082702.5581-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property() 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. machine_set_property() 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 Reviewed-by: Marc-Andr=C3=A9 Lureau --- vl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/vl.c b/vl.c index aa03192019..c3c17106bf 100644 --- a/vl.c +++ b/vl.c @@ -2676,7 +2676,7 @@ static int machine_set_property(void *opaque, g_free(qom_name); =20 if (local_err) { - error_report_err(local_err); + error_propagate(errp, local_err); return -1; } =20 @@ -4248,11 +4248,8 @@ int main(int argc, char **argv, char **envp) } =20 machine_opts =3D qemu_get_machine_opts(); - if (qemu_opt_foreach(machine_opts, machine_set_property, current_mac= hine, - NULL)) { - object_unref(OBJECT(current_machine)); - exit(1); - } + qemu_opt_foreach(machine_opts, machine_set_property, current_machine= , + &error_fatal); =20 configure_accelerator(current_machine); =20 --=20 2.17.1