From nobody Wed Nov 12 07:07:00 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1568716597; cv=none; d=zoho.com; s=zohoarc; b=Gb+bY1w06WLEHXhji1Xt35oIoJQebqzN4WCYQkK2kwk2pKoIxr9DJQrIrOUZkAGQitHSrM8rT6QKJxg760CSey8Ysgy7Nm5wj7K0vQC+Z+SuwnSLlAsHZykyXAP7x28N0x2TC/xjrUrjgxKw22MZoTMyahpOIjgcUFdTs611WmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568716597; 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:ARC-Authentication-Results; bh=iEkleBwtDQQwHl/vd68hjm9nUUEy/ia9/y2x4NyZY5g=; b=HrtkSo2FMDtXKNGOx1n7ytgJqo+cFPpSfno9+u//Rrq5ypO4s74O8ofL5OrwWUaMzWFm39KRdNeWiwMgFjlxWWB9rHN/LFzEeDRx/jtStg0ZIevI2D+2bJ2OOxGM744JHpCSzU6j6TpovUKuwnyc2lqzx+JW8Rn3IiS1R+xypMM= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568716597330732.7836707799869; Tue, 17 Sep 2019 03:36:37 -0700 (PDT) Received: from localhost ([::1]:43814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAAqZ-0002X8-2R for importer@patchew.org; Tue, 17 Sep 2019 06:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43719) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAAbr-0006xW-I8 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 06:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAAbq-0003mY-9E for qemu-devel@nongnu.org; Tue, 17 Sep 2019 06:21:23 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34564) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAAbq-0003mK-0z for qemu-devel@nongnu.org; Tue, 17 Sep 2019 06:21:22 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x8HAHFVW110704 for ; Tue, 17 Sep 2019 06:21:21 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2v2w62hc3e-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 17 Sep 2019 06:21:20 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Sep 2019 11:21:17 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 17 Sep 2019 11:21:11 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x8HALADO49217772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Sep 2019 10:21:10 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 02A3BAE055; Tue, 17 Sep 2019 10:21:10 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0C731AE045; Tue, 17 Sep 2019 10:21:09 +0000 (GMT) Received: from bahia.lan (unknown [9.145.22.84]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 17 Sep 2019 10:21:08 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 17 Sep 2019 12:21:08 +0200 In-Reply-To: <156871562997.196432.17776290406203122029.stgit@bahia.lan> References: <156871562997.196432.17776290406203122029.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19091710-4275-0000-0000-000003678A42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19091710-4276-0000-0000-00003879EF77 Message-Id: <156871566867.196432.11276188812327366259.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-09-17_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=509 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909170106 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 06/17] vfio: Pass local error object pointer to error_append_hint() 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: Fam Zheng , Peter Maydell , "Michael S. Tsirkin" , Jeff Cody , Mark Cave-Ayland , Michael Roth , Gerd Hoffmann , Subbaraya Sundeep , Juan Quintela , David Hildenbrand , Markus Armbruster , Halil Pasic , Christian Borntraeger , =?utf-8?q?Marc-Andr=C3=A9?= Lureau , David Gibson , Eric Farman , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , "Daniel P. =?utf-8?q?Berrang=C3=A9=22?= , qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org"@d06av26.portsmouth.uk.ibm.com, John Snow , Richard Henderson , Kevin Wolf , Cornelia Huck , Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Ensure that hints are added even if errp is &error_fatal or &error_abort. Signed-off-by: Greg Kurz Reviewed-by: Cornelia Huck --- hw/vfio/common.c | 14 ++++++++++---- hw/vfio/pci.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 3e03c495d868..05b1c39a426f 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1469,10 +1469,13 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace= *as, Error **errp) } =20 if (!(status.flags & VFIO_GROUP_FLAGS_VIABLE)) { - error_setg(errp, "group %d is not viable", groupid); - error_append_hint(errp, + Error *err =3D NULL; + + error_setg(&err, "group %d is not viable", groupid); + error_append_hint(&err, "Please ensure all devices within the iommu_grou= p " "are bound to their vfio bus driver.\n"); + error_propagate(errp, err); goto close_fd_exit; } =20 @@ -1531,11 +1534,14 @@ int vfio_get_device(VFIOGroup *group, const char *n= ame, =20 fd =3D ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, name); if (fd < 0) { - error_setg_errno(errp, errno, "error getting device from group %d", + Error *err =3D NULL; + + error_setg_errno(&err, errno, "error getting device from group %d", group->groupid); - error_append_hint(errp, + error_append_hint(&err, "Verify all devices in group %d are bound to vfio- " "or pci-stub and not already in use\n", group->group= id); + error_propagate(errp, err); return fd; } =20 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index dc3479c374e3..b037dec2215b 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2527,10 +2527,13 @@ static void vfio_populate_device(VFIOPCIDevice *vde= v, Error **errp) g_free(reg_info); =20 if (vdev->features & VFIO_FEATURE_ENABLE_VGA) { - ret =3D vfio_populate_vga(vdev, errp); + Error *err =3D NULL; + + ret =3D vfio_populate_vga(vdev, &err); if (ret) { - error_append_hint(errp, "device does not support " + error_append_hint(&err, "device does not support " "requested feature x-vga\n"); + error_propagate(errp, err); return; } } @@ -2714,9 +2717,10 @@ static void vfio_realize(PCIDevice *pdev, Error **er= rp) if (!vdev->vbasedev.sysfsdev) { if (!(~vdev->host.domain || ~vdev->host.bus || ~vdev->host.slot || ~vdev->host.function)) { - error_setg(errp, "No provided host device"); - error_append_hint(errp, "Use -device vfio-pci,host=3DDDDD:BB:D= D.F " + error_setg(&err, "No provided host device"); + error_append_hint(&err, "Use -device vfio-pci,host=3DDDDD:BB:D= D.F " "or -device vfio-pci,sysfsdev=3DPATH_TO_DEVI= CE\n"); + error_propagate(errp, err); return; } vdev->vbasedev.sysfsdev =3D