From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xg9PD-0003Br-HV for qemu-devel@nongnu.org; Mon, 20 Oct 2014 05:37:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xg9P7-0000WV-8r for qemu-devel@nongnu.org; Mon, 20 Oct 2014 05:37:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xg9P6-0000Rz-MK for qemu-devel@nongnu.org; Mon, 20 Oct 2014 05:37:29 -0400 Date: Mon, 20 Oct 2014 11:37:22 +0200 From: Igor Mammedov Message-ID: <20141020113722.3df60f50@nial.usersys.redhat.com> In-Reply-To: <543E8649.7050006@redhat.com> References: <1413371003-43597-1-git-send-email-imammedo@redhat.com> <1413371003-43597-3-git-send-email-imammedo@redhat.com> <543E8649.7050006@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] vl.c: reduce exit on error code duplication List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, aliguori@amazon.com On Wed, 15 Oct 2014 08:35:53 -0600 Eric Blake wrote: > On 10/15/2014 05:03 AM, Igor Mammedov wrote: > > use exit_if_error() helper instead of a bunch of > > if (local_err) { > > error_report(foo); > > error_free(local_err); > > exit(1); > > } > > code blocks > > > > Signed-off-by: Igor Mammedov > > --- > > vl.c | 58 ++++++++++++++++++++++++++++++---------------------------- > > 1 file changed, 30 insertions(+), 28 deletions(-) > > Not much net change, but I like the refactoring. > > > > static int default_driver_check(QemuOpts *opts, void *opaque) > > { > > const char *driver = qemu_opt_get(opts, "driver"); > > @@ -2380,11 +2404,7 @@ static int chardev_init_func(QemuOpts *opts, void *opaque) > > Error *local_err = NULL; > > > > qemu_chr_new_from_opts(opts, NULL, &local_err); > > - if (local_err) { > > - error_report("%s", error_get_pretty(local_err)); > > - error_free(local_err); > > - return -1; > > - } > > + exit_if_error(local_err, NULL); > > return 0; > > } > > Idea for followup patch: this function now always returns 0 (if it > returns at all); therefore, change its signature to void and simplify > further. it won't work in this case since it's called by qemu_opts_foreach() which requires return value. > > > > > @@ -2790,12 +2810,7 @@ static int machine_set_property(const char *name, const char *value, > > string_input_visitor_cleanup(siv); > > g_free(qom_name); > > > > - if (local_err) { > > - qerror_report_err(local_err); > > - error_free(local_err); > > - return -1; > > - } > > - > > + exit_if_error(local_err, NULL); > > return 0; > > } > > Same idea for simplification. ditto > > But as that should be a separate patch, this one is: > Reviewed-by: Eric Blake >