From 88fdf56f2a5aa44c7bb71edeb7398bab9e975e02 Mon Sep 17 00:00:00 2001 From: balrog Date: Sat, 26 Apr 2008 21:11:22 +0000 Subject: [PATCH] IO ports registration errors are fatal errors. Revert previous change that shouldn't have gone in alone (or at all). git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4262 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 3649313..232072b 100644 --- a/vl.c +++ b/vl.c @@ -324,13 +324,13 @@ int register_ioport_read(int start, int length, int size, } 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 @@ int register_ioport_write(int start, int length, int size, } 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; -- 2.7.4