From nobody Sun Feb 8 17:47:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570814112; cv=none; d=zoho.com; s=zohoarc; b=QGwYNeUOU7NwSJLLFhhKBeMAuxS8jhliYSy1KV8IHWm0b0qqwiEpNAJEEVn2sZZ8OaT8soLSiW8mKcZj2TXqEeC2vFJ+sTKZFQM7tvIBLI2XQQFq1yt1VVeWzyQwRYdw98HnaqAbdJTkLqz8G8yCg/Nve56BHCx0DiIGUMs8yFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570814112; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6EpxRl8mGtuLZRdXb4berIOfTM4OEKzGnnnpZsM9w7A=; b=aNq//MYcbRIhxmLtwuj/OQHHAxe7rllxpr82E0LYndep69nf+Tue6Wdu0rPIj1HXKcYx5+Emu6g1kdXw9SfpQcELgqUkpuqHIWd4+ZF9tn/ROYokesg9BMfdmZv/eMnwndaq3kyir6hC2KuIzIUmoPaKNen8tRJo9ApQDRFXRiU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570814112316451.2912135726448; Fri, 11 Oct 2019 10:15:12 -0700 (PDT) Received: from localhost ([::1]:54464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyVQ-0005ur-2L for importer@patchew.org; Fri, 11 Oct 2019 13:15:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36736) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR5-0006WB-Lw for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR3-0004hu-OL for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:35 -0400 Received: from relay.sw.ru ([185.231.240.75]:48350) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR3-0004Ok-Ev for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:33 -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-QI; Fri, 11 Oct 2019 19:06:21 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 076/126] Human Monitor (HMP): introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:02 +0300 Message-Id: <20191011160552.22907-77-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: quoted-printable 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, armbru@redhat.com, "Dr. David Alan Gilbert" , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 =3D=3D &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 --- monitor/misc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/monitor/misc.c b/monitor/misc.c index aef16f6cfb..4c658884f4 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1775,20 +1775,19 @@ void monitor_fdset_dup_fd_remove(int dup_fd) =20 int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) { + ERRP_AUTO_PROPAGATE(); int fd; - Error *local_err =3D NULL; =20 if (!qemu_isdigit(fdname[0]) && mon) { - fd =3D monitor_get_fd(mon, fdname, &local_err); + fd =3D monitor_get_fd(mon, fdname, errp); } else { fd =3D qemu_parse_fd(fdname); if (fd =3D=3D -1) { - error_setg(&local_err, "Invalid file descriptor number '%s'", + error_setg(errp, "Invalid file descriptor number '%s'", fdname); } } - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { assert(fd =3D=3D -1); } else { assert(fd !=3D -1); --=20 2.21.0