From nobody Sun Feb 8 19:59:49 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=1570813149; cv=none; d=zoho.com; s=zohoarc; b=AYeLqxO5uX7IUEeJuS17zlH9CSzV9Ubj2MdaIlnhMQHaZSRfjcGxxfJPxV0T+SbmVtig6AKOaZNAmjtAoC+6Q64IJDRnLkNJnf4LTa9uguzpeIYgJTEuKksWOPmhTJIj6W+I0AMbgvN5V0gSnoRzdZ1AW8vocyCLyByRq72sN6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813149; 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=zeA5btg7+Ndl0JSIDpmh8X/3g8jIAbYej3rZaiCSXvQ=; b=licQaFvzHnlXG+ptfwsc9v67AM0vHJ+QlrwIXJ1K9JAYCGY7SJBjU79yrjA7WpRro7bAGdbuk67iqEPAcF/F+BXQiq6VGVbo+ZSAtIUezzRdjsfr1DVwWaAQbTOK2L970AFztg4G5fH7UweT7qbKckdF3Sj7FEofLxS0Vkfmzr8= 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 157081314992946.95942795867313; Fri, 11 Oct 2019 09:59:09 -0700 (PDT) Received: from localhost ([::1]:54248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyFw-0000lF-8u for importer@patchew.org; Fri, 11 Oct 2019 12:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36472) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxQy-0006Jg-IB for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxQx-0004W4-4w for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:28 -0400 Received: from relay.sw.ru ([185.231.240.75]:48152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxQw-0004IL-Tc for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:27 -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 1iIxQl-0003XG-JW; Fri, 11 Oct 2019 19:06:15 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 058/126] virtio-serial: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:44 +0300 Message-Id: <20191011160552.22907-59-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 , Laurent Vivier , vsementsov@virtuozzo.com, "Michael S. Tsirkin" , Amit Shah , armbru@redhat.com, Greg Kurz , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 --- hw/char/virtio-serial-bus.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 4e0ed829ae..8ab7f29d0a 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -935,12 +935,12 @@ static void remove_port(VirtIOSerial *vser, uint32_t = port_id) =20 static void virtser_port_device_realize(DeviceState *dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); VirtIOSerialPort *port =3D VIRTIO_SERIAL_PORT(dev); VirtIOSerialPortClass *vsc =3D VIRTIO_SERIAL_PORT_GET_CLASS(port); VirtIOSerialBus *bus =3D VIRTIO_SERIAL_BUS(qdev_get_parent_bus(dev)); int max_nr_ports; bool plugging_port0; - Error *err =3D NULL; =20 port->vser =3D bus->vser; port->bh =3D qemu_bh_new(flush_queued_data_bh, port); @@ -986,9 +986,8 @@ static void virtser_port_device_realize(DeviceState *de= v, Error **errp) return; } =20 - vsc->realize(dev, &err); - if (err !=3D NULL) { - error_propagate(errp, err); + vsc->realize(dev, errp); + if (*errp) { return; } =20 --=20 2.21.0