From nobody Mon Feb 9 17:36:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658735; cv=none; d=zohomail.com; s=zohoarc; b=mzkXRi+cPdcUSYDN87XtaD2dyK2n6swFJPXgzJre77fMLwRiA0/f7TG8MhNC3kBBrmfCCcKIwnYWi5aE8zqrEwdFQ3M9TQHRfHXqxjj5vw32Ss/6Y8x3vspBDtmkpiTIbC2tay1Y4r/dWMN3VxiPXbVT3HfAUTe8BeYhyL/G7M8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658735; h=Content-Type: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=HktqrVv0Tt2FKK/0WSo+4o3EvZ+0VSPvuEV+CM3+v8Q=; b=RW/crCXylPJ+OcxtHSmgv/HzdMqS5D/sU5yuw8jCS0e21ZaoLHPB1ye/KlC+L4EtTJIjIWT9KqoBnugf/mBVx9gl3qJX0fdqDdWKNoX75r//nNdDKK1rMNMSoJjtNnT1uH0nSNh4L/DszfaebQG0dWbgedeAVHkTwmpS/s9gYHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1576658735586200.44509169300034; Wed, 18 Dec 2019 00:45:35 -0800 (PST) Received: from localhost ([::1]:51284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUxa-00031c-FT for importer@patchew.org; Wed, 18 Dec 2019 03:45:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47681) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUbo-0005Bv-TU for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUbn-0003su-2m for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:04 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:53754 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUbm-0003qp-VU for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:03 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-GOH8EWd-MkqOup3JYwhUAA-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC455107ACCD; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47D945DA70; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DC2421136432; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HktqrVv0Tt2FKK/0WSo+4o3EvZ+0VSPvuEV+CM3+v8Q=; b=Q658exgyFu4ewYpvJh7InZgtRwDG1LAjXfNTiJOoI40lRhkNALx/j7CJUAjPnsq7QKX2ka 5J8YefA9Owzs6rv9f1iaj5+my98J9IfuleBUEaMzed7s+/TuVVcMAPLQFQN42dl/qHHzNm ohgdaKwUpcnq9/GKKEPFxBRJ9ou+TTE= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 34/35] hw/vfio/ap: drop local_err from vfio_ap_realize Date: Wed, 18 Dec 2019 09:17:20 +0100 Message-Id: <20191218081721.23520-35-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: GOH8EWd-MkqOup3JYwhUAA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Vladimir Sementsov-Ogievskiy , Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy No reason for local_err here, use errp directly instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Markus Armbruster Reviewed-by: Cornelia Huck Message-Id: <20191205174635.18758-21-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- hw/vfio/ap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index da6a20669d..8fbaa724c2 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -89,14 +89,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) { int ret; char *mdevid; - Error *local_err =3D NULL; VFIOGroup *vfio_group; APDevice *apdev =3D AP_DEVICE(dev); VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); =20 - vfio_group =3D vfio_ap_get_group(vapdev, &local_err); + vfio_group =3D vfio_ap_get_group(vapdev, errp); if (!vfio_group) { - goto out_err; + return; } =20 vapdev->vdev.ops =3D &vfio_ap_ops; @@ -113,7 +112,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) */ vapdev->vdev.balloon_allowed =3D true; =20 - ret =3D vfio_get_device(vfio_group, mdevid, &vapdev->vdev, &local_err); + ret =3D vfio_get_device(vfio_group, mdevid, &vapdev->vdev, errp); if (ret) { goto out_get_dev_err; } @@ -123,8 +122,6 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) out_get_dev_err: vfio_ap_put_device(vapdev); vfio_put_group(vfio_group); -out_err: - error_propagate(errp, local_err); } =20 static void vfio_ap_unrealize(DeviceState *dev, Error **errp) --=20 2.21.0