From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Jprg5-0007RU-Nw
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 17:11:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Jprg5-0007R5-3x
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 17:11:25 -0400
Received: from [199.232.76.173] (port=60110 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Jprg5-0007Qy-0E
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 17:11:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <balrogg@gmail.com>) id 1Jprg4-0005FE-Nn
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 17:11:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1Jprg4-0006Mu-Cc
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 21:11:24 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1Jprg3-0006Ma-Jc
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 21:11:24 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1Jprg3-0006Ma-Jc@cvs.savannah.gnu.org>
Date: Sat, 26 Apr 2008 21:11:23 +0000
Subject: [Qemu-devel] [4262] IO ports registration errors are fatal errors.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4262
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4262
Author:   balrog
Date:     2008-04-26 21:11:22 +0000 (Sat, 26 Apr 2008)

Log Message:
-----------
IO ports registration errors are fatal errors.

Revert previous change that shouldn't have gone in alone (or at all).

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2008-04-26 16:04:29 UTC (rev 4261)
+++ trunk/vl.c	2008-04-26 21:11:22 UTC (rev 4262)
@@ -324,13 +324,13 @@
     } else if (size == 4) {
         bsize = 2;
     } else {
-        fprintf(stderr, "register_ioport_read: invalid size\n");
+        hw_error("register_ioport_read: invalid size");
         return -1;
     }
     for(i = start; i < start + length; i += size) {
         ioport_read_table[bsize][i] = func;
         if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque)
-            fprintf(stderr, "register_ioport_read: invalid opaque\n");
+            hw_error("register_ioport_read: invalid opaque");
         ioport_opaque[i] = opaque;
     }
     return 0;
@@ -349,15 +349,13 @@
     } else if (size == 4) {
         bsize = 2;
     } else {
-        fprintf(stderr, "register_ioport_write: invalid size\n");
+        hw_error("register_ioport_write: invalid size");
         return -1;
     }
     for(i = start; i < start + length; i += size) {
         ioport_write_table[bsize][i] = func;
-        if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque) {
-            fprintf(stderr, "register_ioport_write: invalid opaque\n");
-            return -1;
-        }
+        if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque)
+            hw_error("register_ioport_write: invalid opaque");
         ioport_opaque[i] = opaque;
     }
     return 0;