diff options
author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-26 21:11:22 +0000 |
---|---|---|
committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-26 21:11:22 +0000 |
commit | 88fdf56f2a5aa44c7bb71edeb7398bab9e975e02 (patch) | |
tree | fe9342037dd3a77cca6f00f98910faf891321fe8 | |
parent | b22205f2f45d5c5ed1e0e0b83cf258352283d6c4 (diff) |
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
-rw-r--r-- | vl.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -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; |