From patchwork Tue Jul 19 17:03:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 72346 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp188745qga; Tue, 19 Jul 2016 10:09:49 -0700 (PDT) X-Received: by 10.37.197.1 with SMTP id v1mr26170726ybe.46.1468948189297; Tue, 19 Jul 2016 10:09:49 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d82si20092299qkc.297.2016.07.19.10.09.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jul 2016 10:09:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYWZ-000609-Rr for patch@linaro.org; Tue, 19 Jul 2016 13:09:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYQo-0000Yo-Ge for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:03:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPYQm-0004zN-OE for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:03:41 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYQm-0004zA-HK for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:03:40 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bPYQm-0002yb-0b for qemu-devel@nongnu.org; Tue, 19 Jul 2016 18:03:40 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 19 Jul 2016 18:03:34 +0100 Message-Id: <1468947815-9900-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468947815-9900-1-git-send-email-peter.maydell@linaro.org> References: <1468947815-9900-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 1/2] target-arm: Fix unreachable code in gicv3_class_name() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Coverity complains that the exit() in gicv3_class_name() can be unreachable, because if TARGET_AARCH64 is defined then all code paths return before reaching it. Move the exit() up to the error_report() that it belongs with. Signed-off-by: Peter Maydell Reviewed-by: Shannon Zhao Message-id: 1468260552-8400-1-git-send-email-peter.maydell@linaro.org --- target-arm/machine.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 1.9.1 diff --git a/target-arm/machine.c b/target-arm/machine.c index 2dbeb82..7a6ca31 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -340,10 +340,9 @@ const char *gicv3_class_name(void) #else error_report("KVM GICv3 acceleration is not supported on this " "platform"); + exit(1); #endif } else { return "arm-gicv3"; } - - exit(1); }