From patchwork Fri Oct 11 16:05:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11185897 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6CFD13BD for ; Fri, 11 Oct 2019 16:45:57 +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 85E14206CD for ; Fri, 11 Oct 2019 16:45:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85E14206CD 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIy3A-0002KW-8I for patchwork-qemu-devel@patchwork.kernel.org; Fri, 11 Oct 2019 12:45:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36783) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR7-0006YZ-2D for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR4-0004jG-Mt for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:36 -0400 Received: from relay.sw.ru ([185.231.240.75]:48376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR4-0004QH-Et for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:34 -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 1iIxQs-0003XG-Vh; Fri, 11 Oct 2019 19:06:23 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 079/126] cryptodev: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:05 +0300 Message-Id: <20191011160552.22907-80-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 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 , "Gonglei \(Arei\)" , vsementsov@virtuozzo.com, armbru@redhat.com, Greg Kurz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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 --- backends/cryptodev-vhost-user.c | 10 ++++------ backends/cryptodev.c | 14 ++++++-------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-user.c index b344283940..8bab46fd77 100644 --- a/backends/cryptodev-vhost-user.c +++ b/backends/cryptodev-vhost-user.c @@ -177,17 +177,16 @@ static void cryptodev_vhost_user_event(void *opaque, int event) static void cryptodev_vhost_user_init( CryptoDevBackend *backend, Error **errp) { + ERRP_AUTO_PROPAGATE(); int queues = backend->conf.peers.queues; size_t i; - Error *local_err = NULL; Chardev *chr; CryptoDevBackendClient *cc; CryptoDevBackendVhostUser *s = CRYPTODEV_BACKEND_VHOST_USER(backend); - chr = cryptodev_vhost_claim_chardev(s, &local_err); - if (local_err) { - error_propagate(errp, local_err); + chr = cryptodev_vhost_claim_chardev(s, errp); + if (*errp) { return; } @@ -204,8 +203,7 @@ static void cryptodev_vhost_user_init( backend->conf.peers.ccs[i] = cc; if (i == 0) { - if (!qemu_chr_fe_init(&s->chr, chr, &local_err)) { - error_propagate(errp, local_err); + if (!qemu_chr_fe_init(&s->chr, chr, errp)) { return; } } diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 5a9735684e..6fd039567d 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -153,22 +153,20 @@ static void cryptodev_backend_set_queues(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); CryptoDevBackend *backend = CRYPTODEV_BACKEND(obj); - Error *local_err = NULL; uint32_t value; - visit_type_uint32(v, name, &value, &local_err); - if (local_err) { - goto out; + visit_type_uint32(v, name, &value, errp); + if (*errp) { + return; } if (!value) { - error_setg(&local_err, "Property '%s.%s' doesn't take value '%" + error_setg(errp, "Property '%s.%s' doesn't take value '%" PRIu32 "'", object_get_typename(obj), name, value); - goto out; + return; } backend->conf.peers.queues = value; -out: - error_propagate(errp, local_err); } static void