From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8663AC47404 for ; Fri, 11 Oct 2019 16:42:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 59A8D2089F for ; Fri, 11 Oct 2019 16:42:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59A8D2089F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIy0D-0007Cl-Fs for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 12:42:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36743) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR6-0006Wq-4B for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR3-0004gK-1s for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:35 -0400 Received: from relay.sw.ru ([185.231.240.75]:48328) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR2-0004O1-NO for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:32 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIxQr-0003XG-9u; Fri, 11 Oct 2019 19:06:21 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 074/126] Graphics: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:00 +0300 Message-Id: <20191011160552.22907-75-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011160552.22907-1-vsementsov@virtuozzo.com> References: <20191011160552.22907-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Gerd Hoffmann , armbru@redhat.com, Greg Kurz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. Otherwise, this info will not be added when errp == &fatal_err (the program will exit prior to the error_append_hint() or error_prepend() call). Fix such cases. If we want to check error after errp-function call, we need to introduce local_err and than propagate it to errp. Instead, use ERRP_AUTO_PROPAGATE macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_AUTO_PROPAGATE leaves errp as is if it's not NULL or &error_fatel, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) This commit (together with its neighbors) was generated by for f in $(git grep -l errp \*.[ch]); do \ spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff $f; \ done; then fix a bit of compilation problems: coccinelle for some reason leaves several f() { ... goto out; ... out: } patterns, with "out:" at function end. then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Kevin Wolf Reported-by: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy --- ui/input-barrier.c | 7 +++---- ui/input.c | 14 ++++++-------- ui/vnc.c | 19 ++++++++----------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/ui/input-barrier.c b/ui/input-barrier.c index a2c961f285..cce1cf35c3 100644 --- a/ui/input-barrier.c +++ b/ui/input-barrier.c @@ -492,8 +492,8 @@ static gboolean input_barrier_event(QIOChannel *ioc G_GNUC_UNUSED, static void input_barrier_complete(UserCreatable *uc, Error **errp) { + ERRP_AUTO_PROPAGATE(); InputBarrier *ib = INPUT_BARRIER(uc); - Error *local_err = NULL; if (!ib->name) { error_setg(errp, QERR_MISSING_PARAMETER, "name"); @@ -509,9 +509,8 @@ static void input_barrier_complete(UserCreatable *uc, Error **errp) ib->sioc = qio_channel_socket_new(); qio_channel_set_name(QIO_CHANNEL(ib->sioc), "barrier-client"); - qio_channel_socket_connect_sync(ib->sioc, &ib->saddr, &local_err); - if (local_err) { - error_propagate(errp, local_err); + qio_channel_socket_connect_sync(ib->sioc, &ib->saddr, errp); + if (*errp) { return; } diff --git a/ui/input.c b/ui/input.c index 4791b089c7..bea1745a33 100644 --- a/ui/input.c +++ b/ui/input.c @@ -87,12 +87,11 @@ void qemu_input_handler_bind(QemuInputHandlerState *s, const char *device_id, int head, Error **errp) { + ERRP_AUTO_PROPAGATE(); QemuConsole *con; - Error *err = NULL; - con = qemu_console_lookup_by_device_name(device_id, head, &err); - if (err) { - error_propagate(errp, err); + con = qemu_console_lookup_by_device_name(device_id, head, errp); + if (*errp) { return; } @@ -128,18 +127,17 @@ void qmp_input_send_event(bool has_device, const char *device, bool has_head, int64_t head, InputEventList *events, Error **errp) { + ERRP_AUTO_PROPAGATE(); InputEventList *e; QemuConsole *con; - Error *err = NULL; con = NULL; if (has_device) { if (!has_head) { head = 0; } - con = qemu_console_lookup_by_device_name(device, head, &err); - if (err) { - error_propagate(errp, err); + con = qemu_console_lookup_by_device_name(device, head, errp); + if (*errp) { return; } } diff --git a/ui/vnc.c b/ui/vnc.c index 4100d6e404..0354d30168 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3795,6 +3795,7 @@ static int vnc_display_listen(VncDisplay *vd, void vnc_display_open(const char *id, Error **errp) { + ERRP_AUTO_PROPAGATE(); VncDisplay *vd = vnc_display_find(id); QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id); SocketAddress **saddr = NULL, **wsaddr = NULL; @@ -4008,11 +4009,9 @@ void vnc_display_open(const char *id, Error **errp) device_id = qemu_opt_get(opts, "display"); if (device_id) { int head = qemu_opt_get_number(opts, "head", 0); - Error *err = NULL; - con = qemu_console_lookup_by_device_name(device_id, head, &err); - if (err) { - error_propagate(errp, err); + con = qemu_console_lookup_by_device_name(device_id, head, errp); + if (*errp) { goto fail; } } else { @@ -4106,18 +4105,16 @@ QemuOpts *vnc_parse(const char *str, Error **errp) int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) { - Error *local_err = NULL; + ERRP_AUTO_PROPAGATE(); char *id = (char *)qemu_opts_id(opts); assert(id); - vnc_display_init(id, &local_err); - if (local_err) { - error_propagate(errp, local_err); + vnc_display_init(id, errp); + if (*errp) { return -1; } - vnc_display_open(id, &local_err); - if (local_err != NULL) { - error_propagate(errp, local_err); + vnc_display_open(id, errp); + if (*errp) { return -1; } return 0; -- 2.21.0