From nobody Mon Feb 9 17:36:32 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=1626786517; cv=none; d=zohomail.com; s=zohoarc; b=APGOxzc5UtO2+0qf03GnTEhYjJwz9obKvDvsJacWWZYNLpkfo+OZdfAyyhu9hRCuKZ8B2AragH206xS7WNUI+6DxyDisGOS8jBql1LkCX0n7/B72+JwBb5X8SG8JIlw6++YG6jvq0dZIYNnKM5SmmYkM39m0GY/pp8+1sNJPx/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626786517; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gz9LhF2oTT5mao087ujU+bzlIFTt5GBr0gQoxyvJCJA=; b=l6pmVgpn4zZKFGcGwmDbdApf9bp6bMtb5hskuszKCEcO9SFLWrg49vQ9yPFN5y4mCUI9G3VafUBG1LzyVNkgrQ0EfIXCc44qzbYBgyFW4C8VW9wfOub61CFpgRJsDmLMe+rslzyclrxCGTuxJs/UCV/ybfPE+dUBVyz98NYs3jc= 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 162678651715070.40714059132176; Tue, 20 Jul 2021 06:08:37 -0700 (PDT) Received: from localhost ([::1]:53108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5pUB-0004zL-Ok for importer@patchew.org; Tue, 20 Jul 2021 09:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5pGX-0005Bm-5U for qemu-devel@nongnu.org; Tue, 20 Jul 2021 08:54:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5pGQ-0008JK-Lw for qemu-devel@nongnu.org; Tue, 20 Jul 2021 08:54:28 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-235-g4NM3T41Pp2iHe0UfvXZTg-1; Tue, 20 Jul 2021 08:54:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9157804308 for ; Tue, 20 Jul 2021 12:54:17 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-187.ams2.redhat.com [10.36.114.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BCCDD60CA1; Tue, 20 Jul 2021 12:54:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1BF04112D851; Tue, 20 Jul 2021 14:54:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626785662; 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=gz9LhF2oTT5mao087ujU+bzlIFTt5GBr0gQoxyvJCJA=; b=Xoi32yAyCjNyZXeK2Q7dlt2FrpegywyL4QH1plFVn5bZRjVP6kqMtA1TMzCeYseltRSpTQ 8iJfWJb9WV386Z39huexJ2Tw13UfTJ1WdIXeyN+7G0fem3XWUDm1twJrIns0vpuZzEW53/ 5Ntki0dg457i0hn8MYoN3kgjb8pQvDQ= X-MC-Unique: g4NM3T41Pp2iHe0UfvXZTg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 13/16] vhost: Clean up how VhostOpts method vhost_backend_init() fails Date: Tue, 20 Jul 2021 14:54:05 +0200 Message-Id: <20210720125408.387910-14-armbru@redhat.com> In-Reply-To: <20210720125408.387910-1-armbru@redhat.com> References: <20210720125408.387910-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626786517856100001 Content-Type: text/plain; charset="utf-8" vhost_user_backend_init() can fail without setting an error. Unclean. Its caller vhost_dev_init() compensates by substituting a generic error then. Goes back to commit 28770ff935 "vhost: Distinguish errors in vhost_backend_init()". Clean up by moving the generic error from vhost_dev_init() to all the failure paths that neglect to set an error. Cc: Kevin Wolf Cc: Michael S. Tsirkin Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/vhost-user.c | 6 ++++++ hw/virtio/vhost.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index dbbd6fbc25..b4a4998088 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1876,6 +1876,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, =20 err =3D vhost_user_get_features(dev, &features); if (err < 0) { + error_setg_errno(errp, -err, "vhost_backend_init failed"); return err; } =20 @@ -1885,6 +1886,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, err =3D vhost_user_get_u64(dev, VHOST_USER_GET_PROTOCOL_FEATURES, &protocol_features); if (err < 0) { + error_setg_errno(errp, EPROTO, "vhost_backend_init failed"); return -EPROTO; } =20 @@ -1903,6 +1905,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, =20 err =3D vhost_user_set_protocol_features(dev, dev->protocol_featur= es); if (err < 0) { + error_setg_errno(errp, EPROTO, "vhost_backend_init failed"); return -EPROTO; } =20 @@ -1911,6 +1914,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, err =3D vhost_user_get_u64(dev, VHOST_USER_GET_QUEUE_NUM, &dev->max_queues); if (err < 0) { + error_setg_errno(errp, EPROTO, "vhost_backend_init failed"= ); return -EPROTO; } } else { @@ -1940,6 +1944,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, } else { err =3D vhost_user_get_max_memslots(dev, &ram_slots); if (err < 0) { + error_setg_errno(errp, EPROTO, "vhost_backend_init failed"= ); return -EPROTO; } =20 @@ -1966,6 +1971,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, if (dev->vq_index =3D=3D 0) { err =3D vhost_setup_slave_channel(dev); if (err < 0) { + error_setg_errno(errp, EPROTO, "vhost_backend_init failed"); return -EPROTO; } } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 88f8a397dc..3c0b537f89 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1289,7 +1289,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaq= ue, VhostBackendType backend_type, uint32_t busyloop_timeou= t, Error **errp) { - ERRP_GUARD(); uint64_t features; int i, r, n_initialized_vqs =3D 0; =20 @@ -1301,9 +1300,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaq= ue, =20 r =3D hdev->vhost_ops->vhost_backend_init(hdev, opaque, errp); if (r < 0) { - if (!*errp) { - error_setg_errno(errp, -r, "vhost_backend_init failed"); - } goto fail; } =20 --=20 2.31.1