From patchwork Mon Dec 27 00:00:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 76727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E30E5B70DA for ; Mon, 27 Dec 2010 11:02:09 +1100 (EST) Received: from localhost ([127.0.0.1]:39133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PX0XO-0004XP-2x for incoming@patchwork.ozlabs.org; Sun, 26 Dec 2010 19:02:06 -0500 Received: from [140.186.70.92] (port=41465 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PX0WK-00040V-Qf for qemu-devel@nongnu.org; Sun, 26 Dec 2010 19:01:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PX0WJ-0005lG-Oo for qemu-devel@nongnu.org; Sun, 26 Dec 2010 19:01:00 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:47641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PX0WJ-0005lB-53 for qemu-devel@nongnu.org; Sun, 26 Dec 2010 19:00:59 -0500 Received: from smtp05.web.de ( [172.20.4.166]) by fmmailgate03.web.de (Postfix) with ESMTP id 4BD111829548D for ; Mon, 27 Dec 2010 01:00:57 +0100 (CET) Received: from [84.148.29.6] (helo=af.local) by smtp05.web.de with asmtp (WEB.DE 4.110 #2) id 1PX0WG-0001V3-00; Mon, 27 Dec 2010 01:00:56 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 27 Dec 2010 01:00:56 +0100 Message-Id: <1293408056-45428-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.3.4 MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/s7gkKb4f08vpafWc0G42ewmmHTWny3+cjxiMq ArpaiXmO5DBwaj1xa3STKLqhFZ3+BLRan9hFzOPUzXBaDNDEvM Ra2X9MNqvHw8Pd4W9/Kg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH] ioport: Improve error output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When failing due to conflicting I/O port registrations, include the offending I/O port address in the message. Signed-off-by: Andreas Färber --- ioport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ioport.c b/ioport.c index aa4188a..349915f 100644 --- a/ioport.c +++ b/ioport.c @@ -149,7 +149,7 @@ int register_ioport_read(pio_addr_t start, int length, int size, for(i = start; i < start + length; i += size) { ioport_read_table[bsize][i] = func; if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque) - hw_error("register_ioport_read: invalid opaque"); + hw_error("register_ioport_read: invalid opaque for 0x%x", i); ioport_opaque[i] = opaque; } return 0; @@ -168,7 +168,7 @@ int register_ioport_write(pio_addr_t start, int length, int size, for(i = start; i < start + length; i += size) { ioport_write_table[bsize][i] = func; if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque) - hw_error("register_ioport_write: invalid opaque"); + hw_error("register_ioport_write: invalid opaque for 0x%x", i); ioport_opaque[i] = opaque; } return 0;