From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7A7FC433EF for ; Fri, 8 Jul 2022 11:00:31 +0000 (UTC) Received: from localhost ([::1]:32898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9lip-0008Pn-31 for qemu-devel@archiver.kernel.org; Fri, 08 Jul 2022 07:00:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9lZX-0000OJ-Cy for qemu-devel@nongnu.org; Fri, 08 Jul 2022 06:50:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:41098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9lZV-0007sZ-3W for qemu-devel@nongnu.org; Fri, 08 Jul 2022 06:50:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657277452; 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=KA0KPe5bnbmRDs9fmsiwOK6mb/Uxji1BTaZ2d297Fjc=; b=fCZJCGJ50P23ObK08FHJBl6QP34yMCt4z+1lQ7c39db3H2PU9eAGyLEvpTuoDZ2dHTBMVQ XOqtOsK+kZp7vqwRitILYzv+1pKqeOKnR2G3BJ9GFqFNMeijDzN91D3CwEb3A2//GBhyIy IQXaJKd/20jj6e3JtKXuCfykOcTd8Lo= 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-65-5Wr54bICP4OXf7b7ChVTTQ-1; Fri, 08 Jul 2022 06:50:49 -0400 X-MC-Unique: 5Wr54bICP4OXf7b7ChVTTQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E504F1C05EB2; Fri, 8 Jul 2022 10:50:48 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 207561121314; Fri, 8 Jul 2022 10:50:45 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eric Blake , Stefan Hajnoczi , Liuxiangdong , Cindy Lu , Zhu Lingshan , "Gonglei (Arei)" , Laurent Vivier , Gautam Dawar , Stefano Garzarella , Markus Armbruster , Paolo Bonzini , Harpreet Singh Anand , Jason Wang , "Michael S. Tsirkin" , Eli Cohen , Parav Pandit , Cornelia Huck Subject: [PATCH 10/22] vdpa: Small rename of error labels Date: Fri, 8 Jul 2022 12:50:01 +0200 Message-Id: <20220708105013.1899854-11-eperezma@redhat.com> In-Reply-To: <20220708105013.1899854-1-eperezma@redhat.com> References: <20220708105013.1899854-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_LOW=-0.7, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" So later patches are cleaner Signed-off-by: Eugenio Pérez --- hw/virtio/vhost-vdpa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index d6ba4a492a..fccfc832ea 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1024,7 +1024,7 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *dev) int r; bool ok = vhost_vdpa_svq_setup(dev, svq, i, &err); if (unlikely(!ok)) { - goto err; + goto err_svq_setup; } vhost_svq_start(svq, dev->vdev, vq); @@ -1049,8 +1049,7 @@ err_set_addr: err_map: vhost_svq_stop(g_ptr_array_index(v->shadow_vqs, i)); -err: - error_reportf_err(err, "Cannot setup SVQ %u: ", i); +err_svq_setup: for (unsigned j = 0; j < i; ++j) { VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, j); vhost_vdpa_svq_unmap_rings(dev, svq); -- 2.31.1