From nobody Mon Feb 9 14:37:54 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=1630566071; cv=none; d=zohomail.com; s=zohoarc; b=kEWYmaxFVcl3zWE4F6tSzY4GrSxT5PgN3wRemVDyTskXvXowtCc9/ZOdvflrnir9GJlnl0p7SIpsnIbJOz+8p1WbCAD38k9HFZ6jg8VOvQuhvPeuZiR01UdbTPtgkKBkOaYEXtwD8WONHLnKyj52X8nkl0kELUXmHCvdxkMnkiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630566071; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=V1OPgrDUvQgAnd9+SePpUbnTbT2KxXBfqSZ8bPzA2WI=; b=T74qERi6h3eafdozSF1/z8r1iN6qXJb2jTNF7WTj7FSkecpb7wupa+W1UhWFRXQRvhEF5oalJ6VUBvKaFVoZkY1xC3A4mnWe/sDTnZFqUgONQlCr62o2ksqJsiXCbjMdeHlvtyyzl9kZxxib7KEspgcOLq3IlwFBB93U5KGXtMc= 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 1630566071318574.0755240331274; Thu, 2 Sep 2021 00:01:11 -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-24-0ySIiM_LMUqTG9cXy6X9Hw-1; Thu, 02 Sep 2021 03:01:09 -0400 Received: by mail-wm1-f72.google.com with SMTP id z18-20020a1c7e120000b02902e69f6fa2e0so323251wmc.9 for ; Thu, 02 Sep 2021 00:01:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id a6sm917585wrh.97.2021.09.02.00.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 00:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630566070; 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=V1OPgrDUvQgAnd9+SePpUbnTbT2KxXBfqSZ8bPzA2WI=; b=e9LMjlmNb+yU6iYuQt9hJNgD1Ml3iTvAE+MXFjP+oovNI1Ja9j4R1QZXr8Pk3jaFLkcAQW Q1GGuj7/GrrmQMCWDg14vHDphktwg/+KnOo0b/1M29Ks8vte7X0UMfMsaYEmEdJgDtCvQ2 8UirQ49+OOTwFAl9lw09EU5fxIpK6P4= X-MC-Unique: 0ySIiM_LMUqTG9cXy6X9Hw-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=V1OPgrDUvQgAnd9+SePpUbnTbT2KxXBfqSZ8bPzA2WI=; b=YML46AYbMPYZoaPpR/+YKL1rAYOBvCwj3aU52l+thoJor1+joLQWThtMkeNNN9HaBy wIb20bHuPWLUk+SZFCRVj19FhJUjV8HBkUElwQc4rSDcNMB+3zcN69SFdEJyu1DhyPoZ JFUNOD7J6W5Yw+aWUV/e0cNZvpJGUAL198aBpjyImFyTo3IX1DFiW7h9YqnTJ/odFSFg TgyKthfXKLU5Qc9rJkDexZrAQfEuuIXbNpPTDIuKjrMXPKXCUAMHX61edgGm8Apsk9wq vLamb4QG8emZCX0oKPX3a29qFMebqF+c+FPmwF6rsF13r4jDvbKNtPYUX7B//Gr3oDU7 PNHQ== X-Gm-Message-State: AOAM530v00YuL1D38UtvF2I0zkoZ748rTPJ1B1S1uNCSyjLP3D43ROIW +tiKV27aZ7O4tVnZYMIi4yb0yP5ehsnpU11hBR1DBCj8kKX13FFZzAZxbO2F+kVnaZfjdipThHn wrPJjnN+zfuNgSw== X-Received: by 2002:a05:600c:1990:: with SMTP id t16mr1549664wmq.45.1630566068089; Thu, 02 Sep 2021 00:01:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBnaLQDBmhgZ52vkNdpL6UJBhePOKuAx2drr4XNe1mHiArDuZ0H19Lhu0W8yeNO3ZfeW7bLQ== X-Received: by 2002:a05:600c:1990:: with SMTP id t16mr1549640wmq.45.1630566067939; Thu, 02 Sep 2021 00:01:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Hanna Reitz , Auger Eric , qemu-block@nongnu.org, Stefan Hajnoczi Subject: [PATCH v3 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly Date: Thu, 2 Sep 2021 09:00:23 +0200 Message-Id: <20210902070025.197072-10-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210902070025.197072-1-philmd@redhat.com> References: <20210902070025.197072-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: 1630566072755100003 To simplify qemu_vfio_dma_map(): - reduce 'ret' (returned value) scope by returning errno directly, - remove the goto 'out' label. Reviewed-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- util/vfio-helpers.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index b93a3d35787..66148bd381c 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -748,7 +748,6 @@ static bool qemu_vfio_water_mark_reached(QEMUVFIOState = *s, size_t size, int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size, bool temporary, uint64_t *iova, Error **errp) { - int ret =3D 0; int index; IOVAMapping *mapping; uint64_t iova0; @@ -761,32 +760,31 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, s= ize_t size, if (mapping) { iova0 =3D mapping->iova + ((uint8_t *)host - (uint8_t *)mapping->h= ost); } else { + int ret; + if (qemu_vfio_water_mark_reached(s, size, errp)) { - ret =3D -ENOMEM; - goto out; + return -ENOMEM; } if (!temporary) { if (!qemu_vfio_find_fixed_iova(s, size, &iova0, errp)) { - ret =3D -ENOMEM; - goto out; + return -ENOMEM; } =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); - if (ret) { + if (ret < 0) { qemu_vfio_undo_mapping(s, mapping, NULL); - goto out; + return ret; } qemu_vfio_dump_mappings(s); } else { if (!qemu_vfio_find_temp_iova(s, size, &iova0, errp)) { - ret =3D -ENOMEM; - goto out; + return -ENOMEM; } ret =3D qemu_vfio_do_mapping(s, host, size, iova0); - if (ret) { - goto out; + if (ret < 0) { + return ret; } } } @@ -794,8 +792,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, if (iova) { *iova =3D iova0; } -out: - return ret; + return 0; } =20 /* Reset the high watermark and free all "temporary" mappings. */ --=20 2.31.1