From nobody Mon Feb 9 15:10:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629814347; cv=none; d=zohomail.com; s=zohoarc; b=FeXC1Fn9t7SnpOZE77d6Knje8D1AxZJUb3jmwlD2NK2hEvx/vjgRv6fTcXFZ1dLpHncLwn333yBCy6/Hwb1kJwgxPyQ87f4mO1IoheF7u5thSojiJVqfKckfH4Nmm2HSLrfHtBmOKUwNnucbLHkb6SB4qDZs1bP+u3HsIYV4K0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629814347; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=wjVPj1eNKTQy5fwjblCd47XbInf1YqiKgdyKZG3IkLI=; b=n80kJKMHDMKpb7zpb/+koVZYUOOuMnVTOrupzzBx/qn33LENlculMhPlEtLpHNQJHPZTPJBvXYZZqNJUtZJbv4YcUc1Sh/6aRzxcSNGiEJBkUJwkNAQWsPln/pDBu1YGWT8td1NlZal+frlmZQ3bl9ud1ft9bBJG1aylOD7ZA/U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16298143472609.453658949091846; Tue, 24 Aug 2021 07:12:27 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-582-xMvzrNx8OZq-kRGejXv2Xw-1; Tue, 24 Aug 2021 10:12:24 -0400 Received: by mail-wm1-f72.google.com with SMTP id x125-20020a1c3183000000b002e73f079eefso1331470wmx.0 for ; Tue, 24 Aug 2021 07:12:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id z2sm2390454wma.45.2021.08.24.07.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 07:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629814346; 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=wjVPj1eNKTQy5fwjblCd47XbInf1YqiKgdyKZG3IkLI=; b=MQQIpC/iZifnhRzTZrXVzwuV3oOVeOABBsA3A+ExtQsdRDFjynl/v7bodI7WJDixJQiWMX MmIUk1kCGw3ydhbrSF1r1Kb+9cwKpnuGKadR+KeQ5PZgiQt+dWlzYy39nQN0Hw5+qCkqgo skyy8sPgVVD9JxMjU5Uq9sLjXA11AZg= X-MC-Unique: xMvzrNx8OZq-kRGejXv2Xw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wjVPj1eNKTQy5fwjblCd47XbInf1YqiKgdyKZG3IkLI=; b=L9KzHmZh+8h+F1eOu5FdtAgE3Lg6qnWQzWqPnzZiqBHvTJ17+TsWVPrEyGmJj7+M5P oB+tS8OLpsMwRxO6VxPzj6dKbkV7s2ZpcbeB/u3dIBZ07Z0s+WIF+78rVMlReoh15xnp HQSMF0IQ6he7MHTpMOoZgm5dhD1lZLrROGJVGqPXLVxTST8V7XpLuvj9EAyLc++1s8k1 /AIyEAizeK/iRHrGgO5ee5b84Lp8tz9wRMUEgFyCDh3bot0zD/cB+teKIDmCGIXmUMET otbZ8SFqYS4lnb8T+2DNFJiefrtJuxsPdEK4Lp75yyYRCHDQzepIrP79El2bhHgxZibX CU9w== X-Gm-Message-State: AOAM531Zz23t3fOa27WbewDZ9D2tE0TNkU+kDId0xnkcK8rSTVH1W0n6 FdNXSnW1NOotwOejc6/4p0dG9E7VmmG89LH3HBXPDap7mxGs4GLDxLiogB63d3388LIxnDPQiXT JZOaXEqcKdxyfcw== X-Received: by 2002:a05:600c:21cd:: with SMTP id x13mr4267521wmj.20.1629814343500; Tue, 24 Aug 2021 07:12:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeTRBh+ImxKQMXSnT8/PwHAp10tnbMe29s11g353WVUeJV4jEUnq+F+UxzVXH7Q/QPtR6DeQ== X-Received: by 2002:a05:600c:21cd:: with SMTP id x13mr4267507wmj.20.1629814343368; Tue, 24 Aug 2021 07:12:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Auger Eric , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, Fam Zheng Subject: [PATCH 8/9] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error Date: Tue, 24 Aug 2021 16:11:41 +0200 Message-Id: <20210824141142.1165291-9-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210824141142.1165291-1-philmd@redhat.com> References: <20210824141142.1165291-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629814348824100001 Pass qemu_vfio_do_mapping() an Error* argument so it can propagate any error to callers. Replace error_report() which only report to the monitor by the more generic error_setg_errno(). Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- util/vfio-helpers.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index f4c16e1dae5..613f3db3745 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -610,7 +610,7 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState= *s, =20 /* Do the DMA mapping with VFIO. */ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void *host, size_t size, - uint64_t iova) + uint64_t iova, Error **errp) { struct vfio_iommu_type1_dma_map dma_map =3D { .argsz =3D sizeof(dma_map), @@ -622,7 +622,7 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void = *host, size_t size, trace_qemu_vfio_do_mapping(s, host, iova, size); =20 if (ioctl(s->container, VFIO_IOMMU_MAP_DMA, &dma_map)) { - error_report("VFIO_MAP_DMA failed: %s", strerror(errno)); + error_setg_errno(errp, errno, "VFIO_MAP_DMA failed"); return -errno; } return 0; @@ -755,7 +755,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, =20 mapping =3D qemu_vfio_add_mapping(s, host, size, index + 1, io= va0); assert(qemu_vfio_verify_mappings(s)); - ret =3D qemu_vfio_do_mapping(s, host, size, iova0); + ret =3D qemu_vfio_do_mapping(s, host, size, iova0, errp); if (ret < 0) { qemu_vfio_undo_mapping(s, mapping, NULL); return ret; @@ -766,7 +766,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, error_setg(errp, "iova range not found"); return -ENOMEM; } - ret =3D qemu_vfio_do_mapping(s, host, size, iova0); + ret =3D qemu_vfio_do_mapping(s, host, size, iova0, errp); if (ret < 0) { return ret; } --=20 2.31.1