From patchwork Mon Jul 11 18:09:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9223937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D350F60871 for ; Mon, 11 Jul 2016 18:09:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C94FC1FF15 for ; Mon, 11 Jul 2016 18:09:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD6E3265F9; Mon, 11 Jul 2016 18:09:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5DE691FF15 for ; Mon, 11 Jul 2016 18:09:39 +0000 (UTC) Received: from localhost ([::1]:35396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMfeD-00073G-PU for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Jul 2016 14:09:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMfdu-0006xd-NR for qemu-devel@nongnu.org; Mon, 11 Jul 2016 14:09:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMfds-0002Ob-QP for qemu-devel@nongnu.org; Mon, 11 Jul 2016 14:09:17 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58229) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMfdq-0002Nf-MC; Mon, 11 Jul 2016 14:09:14 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bMfdp-00071r-Aj; Mon, 11 Jul 2016 19:09:13 +0100 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 11 Jul 2016 19:09:12 +0100 Message-Id: <1468260552-8400-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 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] [PATCH] 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: , Cc: patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- target-arm/machine.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); }