From nobody Mon Feb 9 01:20:40 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=1570816151; cv=none; d=zoho.com; s=zohoarc; b=AojsMs1anfqkff4U5FU9oLgQXmrzGnyirGaRAmmId4JVfuhyeS/tWyGXKfd9qVDtk4+wZ7HZaAFH89srwvUzsp8rUPgMMMPyGOx8H7l+w/duaS3URedfZI+QrCD7lwexr8PcuAQDUqbbDArVmRYxaU/rC2bO6HpHd23msdNAdwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570816151; 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=3c2PsmAA2prDgAaQMar7MGxgzcUPx0ZLYNn5oAAsHJQ=; b=dy9STkMnHsRs7KGZSAooGoaMvduVncjKEsTvsm/sehrw4v2c3Q5KEx8VsbgDBFKbQMrjmxpnIdr12LdxX3hGJOAnJjlSmr6hj6ncRGNKxB0yjB/4bR5+2CjKrP+LynD+80o6LA+F3svQquGV+NkyMWQtKrHnhl+til6pfiYIweg= 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 1570816151291162.86461032784212; Fri, 11 Oct 2019 10:49:11 -0700 (PDT) Received: from localhost ([::1]:54902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIz2L-0006K5-Q5 for importer@patchew.org; Fri, 11 Oct 2019 13:49:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36837) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR8-0006bJ-Ef for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR6-0004kw-0D for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:38 -0400 Received: from relay.sw.ru ([185.231.240.75]:48408) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR5-0004SQ-Nu for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:35 -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 1iIxQu-0003XG-8Y; Fri, 11 Oct 2019 19:06:24 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 083/126] QMP: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:09 +0300 Message-Id: <20191011160552.22907-84-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, 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/qmp-cmds.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index c6faa3eaf0..2db3199a2e 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -126,9 +126,9 @@ void qmp_x_exit_preconfig(Error **errp) =20 void qmp_cont(Error **errp) { + ERRP_AUTO_PROPAGATE(); BlockBackend *blk; BlockJob *job; - Error *local_err =3D NULL; =20 /* if there is a dump in background, we should wait until the dump * finished */ @@ -161,9 +161,8 @@ void qmp_cont(Error **errp) * If there are no inactive block nodes (e.g. because the VM was just * paused rather than completing a migration), bdrv_inactivate_all() s= imply * doesn't do anything. */ - bdrv_invalidate_cache_all(&local_err); - if (local_err) { - error_propagate(errp, local_err); + bdrv_invalidate_cache_all(errp); + if (*errp) { return; } =20 --=20 2.21.0