From patchwork Tue May 1 08:58:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 156039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4E110B6F9A for ; Tue, 1 May 2012 19:30:27 +1000 (EST) Received: from localhost ([::1]:43510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SP8w9-0007BJ-1G for incoming@patchwork.ozlabs.org; Tue, 01 May 2012 04:59:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SP8vU-0005sF-FY for qemu-devel@nongnu.org; Tue, 01 May 2012 04:59:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SP8vS-0007xW-K6 for qemu-devel@nongnu.org; Tue, 01 May 2012 04:59:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59008 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SP8vS-0007uE-Cd; Tue, 01 May 2012 04:59:14 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id E6B9595DCB; Tue, 1 May 2012 10:59:12 +0200 (CEST) From: Alexander Graf To: qemu-devel Developers Date: Tue, 1 May 2012 10:58:59 +0200 Message-Id: <1335862740-17408-8-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1335862740-17408-1-git-send-email-agraf@suse.de> References: <1335862740-17408-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com, Stefan Weil , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PATCH 7/8] ppce500_spin: Replace assert by hw_error (fixes compiler warning) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Weil The default case in function spin_read should never be reached, therefore the old code used assert(0) to abort QEMU. This does not work when QEMU is compiled with macro NDEBUG defined. In this case (and also when the compiler does not know that assert never returns), there is a compiler warning because of the missing return value. Using hw_error allows an improved error message and aborts always. Signed-off-by: Stefan Weil [agraf: use __func__] Signed-off-by: Alexander Graf --- hw/ppce500_spin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c index 95a2825..fddf219 100644 --- a/hw/ppce500_spin.c +++ b/hw/ppce500_spin.c @@ -179,7 +179,7 @@ static uint64_t spin_read(void *opaque, target_phys_addr_t addr, unsigned len) case 4: return ldl_p(spin_p); default: - assert(0); + hw_error("ppce500: unexpected %s with len = %u", __func__, len); } }