From nobody Sun Feb 8 14:57:07 2026 Delivered-To: importer@patchew.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=1657610589; cv=none; d=zohomail.com; s=zohoarc; b=Ng5lefHR6RxaisDzdS8cXRwwjzDDK89Hl9OkD+q++nc58WI7QxOYUJIBpgj3gq3r7/8xyedFcJvkjbGZaBnocCvNdScLNigTXmLCbCHN1jNquSynEcZGhr7MkSyM96wd02OjiGHNDLwEnegnbbL4WGvL/s7nUbvcUvsVOYDLI+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657610589; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rwjfjExn+wG1ucbjx3Vn2878/88Fyf5V5axZfvfWapU=; b=VAhV5bjSr3foS601jLnbdx+twP73dy4MX+WLjJ3A+l6aEtVbqKgWZUUE8yWlYAqGCo5ydYk4BlSlnw8q5qNPQVsNwEP4OdDBjqQsnm72aLbpkcfRoLoM2TAo++1LnhjsRlwuftV5t5+ew6vQ19kBWEV2jo9ebM3BsTVnRHFjb3g= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165761058938428.965384446822327; Tue, 12 Jul 2022 00:23:09 -0700 (PDT) Received: from localhost ([::1]:46406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBAEc-0000fr-JM for importer@patchew.org; Tue, 12 Jul 2022 03:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBA7J-0005sC-Tu for qemu-devel@nongnu.org; Tue, 12 Jul 2022 03:15:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBA7H-0006FH-NI for qemu-devel@nongnu.org; Tue, 12 Jul 2022 03:15:33 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-140-AzknjKfuPwucrh47q0WHbA-1; Tue, 12 Jul 2022 03:15:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B6C6D1C06ECE; Tue, 12 Jul 2022 07:15:27 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57D5940D2827; Tue, 12 Jul 2022 07:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657610131; 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; bh=rwjfjExn+wG1ucbjx3Vn2878/88Fyf5V5axZfvfWapU=; b=HZNeaZgRKnz8jVADjE5KvmrMJ/b4ZVZ3z8kvZVuHAyVmMDBKS7lqm6vX2+3bECErT/wHVc l28JfgLnRuoH+q5rTNYsqR8ztbTzY6yQ8FlsiO8XcMbMws99h116TN2dcRio1fFUy8jqrV hOoJB1FIit0NtInO1/CHImMGduAl9i8= X-MC-Unique: AzknjKfuPwucrh47q0WHbA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Jason Wang , Laurent Vivier , "Michael S. Tsirkin" , qemu-trivial@nongnu.org Subject: [PATCH] vdpa: Clean vhost_vdpa_dev_start(dev, false) Date: Tue, 12 Jul 2022 09:15:24 +0200 Message-Id: <20220712071524.2144723-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657610591207100001 Return value is never checked and is a clean path, so assume success Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 66f054a12c..d6ba4a492a 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -872,41 +872,35 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev *d= ev, /** * Unmap a SVQ area in the device */ -static bool vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, +static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, const DMAMap *needle) { const DMAMap *result =3D vhost_iova_tree_find_iova(v->iova_tree, needl= e); hwaddr size; - int r; =20 if (unlikely(!result)) { error_report("Unable to find SVQ address to unmap"); - return false; + return; } =20 size =3D ROUND_UP(result->size, qemu_real_host_page_size()); - r =3D vhost_vdpa_dma_unmap(v, result->iova, size); - return r =3D=3D 0; + vhost_vdpa_dma_unmap(v, result->iova, size); } =20 -static bool vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev, +static void vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev, const VhostShadowVirtqueue *svq) { DMAMap needle =3D {}; struct vhost_vdpa *v =3D dev->opaque; struct vhost_vring_addr svq_addr; - bool ok; =20 vhost_svq_get_vring_addr(svq, &svq_addr); =20 needle.translated_addr =3D svq_addr.desc_user_addr; - ok =3D vhost_vdpa_svq_unmap_ring(v, &needle); - if (unlikely(!ok)) { - return false; - } + vhost_vdpa_svq_unmap_ring(v, &needle); =20 needle.translated_addr =3D svq_addr.used_user_addr; - return vhost_vdpa_svq_unmap_ring(v, &needle); + vhost_vdpa_svq_unmap_ring(v, &needle); } =20 /** @@ -1066,23 +1060,19 @@ err: return false; } =20 -static bool vhost_vdpa_svqs_stop(struct vhost_dev *dev) +static void vhost_vdpa_svqs_stop(struct vhost_dev *dev) { struct vhost_vdpa *v =3D dev->opaque; =20 if (!v->shadow_vqs) { - return true; + return; } =20 for (unsigned i =3D 0; i < v->shadow_vqs->len; ++i) { VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, i); - bool ok =3D vhost_vdpa_svq_unmap_rings(dev, svq); - if (unlikely(!ok)) { - return false; - } + vhost_vdpa_svq_unmap_rings(dev, svq); } =20 - return true; } =20 static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started) @@ -1099,10 +1089,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev *de= v, bool started) } vhost_vdpa_set_vring_ready(dev); } else { - ok =3D vhost_vdpa_svqs_stop(dev); - if (unlikely(!ok)) { - return -1; - } + vhost_vdpa_svqs_stop(dev); vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs); } =20 --=20 2.31.1