From nobody Sun Feb 8 01:31:11 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578337973; cv=none; d=zohomail.com; s=zohoarc; b=MGqRbSN7l1nCJfinD8t7rLCgMHdHI+fn4HPMGbw2NZDx0zdbhLxPghpwNm1uzeCnPHsG6IksZczDSFMckeLHdFCZX84AzNFnpLQ7+EqlYLKJLPzHB7XMKz0Iz/Nl2jjZrJjSV2I4dHZDhAnKBVd18Lr34TscpQcdrDTPZ0ygBoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578337973; h=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=3FG9qdDQWzZLGEvFHKtE2+cU1rKneLyoMCDilVuOhQw=; b=YAGdh9lEKudFNC/JtcC5ktgAiaI38ZGermm19lHIsPk4znilfVAFCv1UqdMZP38w3/xiZK1FnmG5Q4hELDxBrv6bpwz/McGBliUJsahZGIQuI9d371VkspyEav9HK6+5BmH2fkQyGeyfw5w6QlPbXGkUqVCO5mEOQFNlxr5PWDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578337973619474.4713064330032; Mon, 6 Jan 2020 11:12:53 -0800 (PST) Received: from localhost ([::1]:58574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioXo4-00075L-9P for importer@patchew.org; Mon, 06 Jan 2020 14:12:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46223) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioX4t-0003Jc-MS for qemu-devel@nongnu.org; Mon, 06 Jan 2020 13:26:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioX4s-0004yM-MB for qemu-devel@nongnu.org; Mon, 06 Jan 2020 13:26:11 -0500 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:38123) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioX4s-0004y0-I5; Mon, 06 Jan 2020 13:26:10 -0500 Received: by mail-qk1-x741.google.com with SMTP id k6so40298558qki.5; Mon, 06 Jan 2020 10:26:10 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 10:26:09 -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=3FG9qdDQWzZLGEvFHKtE2+cU1rKneLyoMCDilVuOhQw=; b=GtSaFG8D1mBVeP9wYwdRsmx7jcl3MN12LcQELS2dx6mPJSyN+d7D/TqBkLUCcUL91Z pshF27WZbKMYFQAIp0G4naYN6nBcbDAUwS3tGLKw+LiUdVLz/pk3TKGQMBQDx2FZHddP d0T4Twaa5/Hj9ChzEhzh3XDZd5t2VROGdeqMd+XXWfewSFZvAeKIwGw5ZO9sEHVBHcOR sGwzTMjVSmPuzGHTsv/n+t5sYkUbgcYQs8QKVKJbo1j/13rd6hIdiDI0zOrYsOa9MyXW cPlXfBfLUnBZDh/CPdxw/iGylpD0cCctLe4kxmE0IDmXsHHDx+0DvOhTrVMxUZTTZkSb xIWQ== 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=3FG9qdDQWzZLGEvFHKtE2+cU1rKneLyoMCDilVuOhQw=; b=XG+9UbDaGOr/+d3ZBow58jUjBNpFwGQBfFqBXam3JwNWMAC/u9zXX2G4FORF+P3i1j IhjHWBpaF82HJlQ+8sduPp2jf9ttLmaavRS2EPTDxwCxpEEyrHpU/ElajCSEXv8wEMSY ZYEQJ0dkGKr3TQ1QDnRLkNHy2/8Xg98i8QqLOAaWWB8D1xslTjSzOMQv1XtqVK7xWCnu rADTwYtCEQJwEtbwUaYlnQDGMPuqDnhQqW7Hz+bRnF8SO93Oa/BfwOxgMOpGYoLvb3nj IQYI4/2SctCTRRF4nWe52e1L1FEqJnC7G2hX4aKWt+/Z7uK2HZ+ttCip+O+AgUReSAp/ sKdQ== X-Gm-Message-State: APjAAAUGbv3EN1CiGYNTJaSOeCCAGZJN7Uu/qXl8gtVMEfEqZh7+Jzkc NHH7eSus5dc8OygoRKeGwyLSR3xm X-Google-Smtp-Source: APXvYqzFew3AJMCvTiarhXTnm1iHIqDjLoyAdP9XUwvEvi4CAIw5zq9xyF6Xr0nVkXGwaZxqVdwk1g== X-Received: by 2002:a37:48f:: with SMTP id 137mr83918265qke.25.1578335169968; Mon, 06 Jan 2020 10:26:09 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v1 43/59] i386/amd_iommu.c: remove unneeded label in amdvi_int_remap_msi() Date: Mon, 6 Jan 2020 15:24:09 -0300 Message-Id: <20200106182425.20312-44-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 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::741 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 'remap_fail' label can be replaced by 'return' with the adequate error value. CC: Michael S. Tsirkin CC: Marcel Apfelbaum Signed-off-by: Daniel Henrique Barboza --- hw/i386/amd_iommu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index b1175e52c7..711e1f6e40 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1268,7 +1268,7 @@ static int amdvi_int_remap_msi(AMDVIState *iommu, trace_amdvi_ir_delivery_mode("fixed/arbitrated"); ret =3D __amdvi_int_remap_msi(iommu, origin, translated, dte, &irq= , sid); if (ret < 0) { - goto remap_fail; + return ret; } else { /* Translate IRQ to MSI messages */ x86_iommu_irq_to_msi_message(&irq, translated); @@ -1298,7 +1298,7 @@ static int amdvi_int_remap_msi(AMDVIState *iommu, } =20 if (ret < 0) { - goto remap_fail; + return ret; } =20 /* @@ -1309,25 +1309,20 @@ static int amdvi_int_remap_msi(AMDVIState *iommu, dest_mode =3D (origin->address >> MSI_ADDR_DEST_MODE_SHIFT) & 1; if (dest_mode) { trace_amdvi_ir_err("invalid dest_mode"); - ret =3D -AMDVI_IR_ERR; - goto remap_fail; + return -AMDVI_IR_ERR; } =20 if (pass) { memcpy(translated, origin, sizeof(*origin)); } else { trace_amdvi_ir_err("passthrough is not enabled"); - ret =3D -AMDVI_IR_ERR; - goto remap_fail; + return -AMDVI_IR_ERR; } =20 out: trace_amdvi_ir_remap_msi(origin->address, origin->data, translated->address, translated->data); return 0; - -remap_fail: - return ret; } =20 static int amdvi_int_remap(X86IOMMUState *iommu, --=20 2.24.1