From nobody Sat Feb 7 09:29:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1603214732; cv=none; d=zohomail.com; s=zohoarc; b=nNA/HI+yF6FfPhtXboTUX9wgrEnbUMgdn1BdrxF7/ULls4sO+iV39cXmLDlvrXBy018seuKa/M5Duc8gEJflfHCeuUEsJGhl6ZrCE4IagUPdvta7bOvfumDD6RYHR3pUTNcpIG+mrExKgGA6vvsdCOfIhD0KJdFuE/A7Iryky0o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603214732; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=7LYaPDykygFtAxF5+J+IEj33yA5rBInQCpCJf3vg5O0=; b=Hgrax3FOSinY3LCeX0sWHkWW8XN2DtP9f7XStb83YlI5RIyeimoJM2g+wmMqLjnwZHBu3Hkyz3sIGyeSt/Qzfoe3z5luSVYvSM9DDs5CudwfHSBeJjRbOTzLfucZ/cRQl2vpjYUd4iphjf/FI2U7O2C9/myrosVFV4ZfWMFFpG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603214732522316.6249839824137; Tue, 20 Oct 2020 10:25:32 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293--plMQSKmMhGfcmm6G-up7w-1; Tue, 20 Oct 2020 13:25:28 -0400 Received: by mail-wm1-f71.google.com with SMTP id w23so629954wmi.1 for ; Tue, 20 Oct 2020 10:25:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id c130sm3589568wma.17.2020.10.20.10.25.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 10:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603214731; 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=7LYaPDykygFtAxF5+J+IEj33yA5rBInQCpCJf3vg5O0=; b=V2g0z9c/3Wvlr7DWtOaJBFnNS+3BG7E41kTmXYmb/FLmvNkuQq9SIVll/nVtR14F+Uuqcx Ah+wNcZOrSbTVCNeVoNgMWaBZ5dp1dg3Hrt91Khj9frRYtSdd7DDwhjvYHC4CyKZhgTK4F IoiU9QS7W14wHUURB5tbJ1X4e3ehjfE= X-MC-Unique: -plMQSKmMhGfcmm6G-up7w-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=7LYaPDykygFtAxF5+J+IEj33yA5rBInQCpCJf3vg5O0=; b=EEU46okTAWbS3IsRJX6kxBx5TtbcNxafQOby7rRJ6PYTO7ox+EXud1TVWXUmaKq2oJ JzXfAAT1sgDRb/yr6oc5EK/IGaOPSWzwS1cLTX/OLbEfZgyysb32K07edOlOhZiX2s3X KBT8oWfs5N8HXsxAos1BE6nPsgFuHRgFwPflt8lQTmgXeBzm+ouEYiEcczR0DnqEvhil acVZYGpqeiEJd2qH4pw8FjszcvCzPJPLxMjLw2I8A2J8vX25IGCEdww7Cp/et2tYteik XjVUnEgCDilJLbpySUxyYNk5gEUDIE7UHDsQMhs526Ge94VNusP6cArzMzoRiGikgsEW VfOw== X-Gm-Message-State: AOAM530YxeYiZfoGZNgwBKyD5laMQEdBePAxuqxumz0Ka/QHHfmXSpXC ypjmsuL9qG+R73IzZX9ZOGsGfyqCcW1RtmX/fhxSMrxhC5hXGTzMn/p2lyImoB2lbNw43lF8kwV 5hzg9hfOD5UU/0g== X-Received: by 2002:adf:fd49:: with SMTP id h9mr4977127wrs.115.1603214726913; Tue, 20 Oct 2020 10:25:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8bH8yADkwParrzpk3HEb+VNDg6I537fQ5Ih2TTJxKFYwGhLQLS70gFcu/Hh5/9p+PagnMuA== X-Received: by 2002:adf:fd49:: with SMTP id h9mr4977099wrs.115.1603214726693; Tue, 20 Oct 2020 10:25:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alex Williamson , Stefan Hajnoczi , Max Reitz , Fam Zheng , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error Date: Tue, 20 Oct 2020 19:24:23 +0200 Message-Id: <20201020172428.2220726-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020172428.2220726-1-philmd@redhat.com> References: <20201020172428.2220726-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) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --- 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 8c075d9aae7..fb180becc4f 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -639,7 +639,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), @@ -651,7 +651,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; @@ -787,7 +787,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, goto out; } 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) { qemu_vfio_undo_mapping(s, mapping, NULL); goto out; @@ -798,7 +798,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, ret =3D -ENOMEM; goto out; } - ret =3D qemu_vfio_do_mapping(s, host, size, iova0); + ret =3D qemu_vfio_do_mapping(s, host, size, iova0, errp); if (ret) { goto out; } --=20 2.26.2