From patchwork Mon Jan 6 18:24:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 1218387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ViZJtqqC"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 47s4VT3zmdz9sPK for ; Tue, 7 Jan 2020 05:56:33 +1100 (AEDT) Received: from localhost ([::1]:58154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioXYE-0008Im-Q7 for incoming@patchwork.ozlabs.org; Mon, 06 Jan 2020 13:56:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46449) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioX59-0003lH-38 for qemu-devel@nongnu.org; Mon, 06 Jan 2020 13:26:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioX58-0005DM-0C for qemu-devel@nongnu.org; Mon, 06 Jan 2020 13:26:26 -0500 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:42555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioX57-0005D7-Sm; Mon, 06 Jan 2020 13:26:25 -0500 Received: by mail-qk1-x743.google.com with SMTP id z14so39016754qkg.9; Mon, 06 Jan 2020 10:26:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0v81XTgpe39UJaMXds5mD2XgR/7Ua6QyU6w1mwdmCXM=; b=ViZJtqqCIYXTcWLD/22pFaG95qUlFyo49tNVAh+CDYXLpd9LYH7KX/BQYcvqDs/yUi ik/p6lx3qUPTq4i6XbhwIxEjo8Sd+AgnpNeWJbdMu1MBqfIUeECHbHUT0L3oqopUTsvm o9VrmlLYUvA1OjLMlG8wYNlmzCMOfjUnqO/ZZO7sCCVrG7QCmVLb8oqR9ctL+P40BQSg jxXaw3ci7t+pcuwoIuV20wJ7sESgk7Vr0KXzpwuvI8rz92+CcDALJWQlYkcYBL6W6zDh /7UjsAO/YcG18Ne8i5epZN3bVZ9L0FnV0hkK1KpHhSMh6Pd3JDkOu8Kia8eBV5kbx4cq xjSQ== 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=0v81XTgpe39UJaMXds5mD2XgR/7Ua6QyU6w1mwdmCXM=; b=IvujFk0Scgxtfew7ZG9UZKqfl2TC5gh8tDomOQCheeLQ4dMiY1z1vB1NsFWo7MRbbV d/H/0sxHru5i55QhIpnKkGtqzWSoa2qWoGZkx3C1tF/pYJtmBzKLSy7eVgjG9Q7LbCUV F+L728bJbRs2SyV3wOYhgHwjij60GNob1zaFX4S/v2I79DzjDElezPJcF+/x0RbWOdXn ebjeD9KrpuMnsrFN3yM0F/oRHSlKb8yMVK9bGG0YGXOlS9K8hbCD5Bo5sXRhFOPr+QCO r1Cam5SMTKxV4wWSa9tFJue/8VyP125krpYlxfOoFTfzGcd1mxGKfgAflgkggUiRvfN6 aiYw== X-Gm-Message-State: APjAAAUqJi36Row61Wnu8IvsExNcCrhS25q5vxrKNEa55Y2+qpWlmmcs M+G4g1T2gawhecxMZkNERUvP4pYE X-Google-Smtp-Source: APXvYqy9QOYrdk3Drvow6+RkYXXFtLZ8YsGNL4zUxm54gTZBLULiM8QInD8M5hYvmyXCmFTkggQkEw== X-Received: by 2002:ae9:f711:: with SMTP id s17mr83113900qkg.238.1578335185353; Mon, 06 Jan 2020 10:26:25 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id b81sm21026522qkc.135.2020.01.06.10.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 10:26:25 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v1 52/59] net/vhost_net.c: remove unneeded labels Date: Mon, 6 Jan 2020 15:24:18 -0300 Message-Id: <20200106182425.20312-53-danielhb413@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200106182425.20312-1-danielhb413@gmail.com> References: <20200106182425.20312-1-danielhb413@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::743 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: qemu-trivial@nongnu.org, Daniel Henrique Barboza , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Label 'fail_notifiers' in vhost_net_start_one() and 'err' in vhost_net_start() can be replaced by 'return r'. CC: Michael S. Tsirkin Signed-off-by: Daniel Henrique Barboza --- hw/net/vhost_net.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 6b82803fa7..272519f970 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -230,7 +230,7 @@ static int vhost_net_start_one(struct vhost_net *net, r = vhost_dev_enable_notifiers(&net->dev, dev); if (r < 0) { - goto fail_notifiers; + return r; } r = vhost_dev_start(&net->dev, dev); @@ -278,7 +278,6 @@ fail: vhost_dev_stop(&net->dev, dev); fail_start: vhost_dev_disable_notifiers(&net->dev, dev); -fail_notifiers: return r; } @@ -331,7 +330,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, r = k->set_guest_notifiers(qbus->parent, total_queues * 2, true); if (r < 0) { error_report("Error binding guest notifier: %d", -r); - goto err; + return r; } for (i = 0; i < total_queues; i++) { @@ -362,7 +361,7 @@ err_start: fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e); fflush(stderr); } -err: + return r; }