Revision 2ac71179 hw/pl031.c

b/hw/pl031.c
119 119
                (int)offset);
120 120
        break;
121 121
    default:
122
        cpu_abort(cpu_single_env, "pl031_read: Bad offset 0x%x\n",
123
                  (int)offset);
122
        hw_error("pl031_read: Bad offset 0x%x\n", (int)offset);
124 123
        break;
125 124
    }
126 125

  
......
168 167
        break;
169 168

  
170 169
    default:
171
        cpu_abort(cpu_single_env, "pl031_write: Bad offset 0x%x\n",
172
                  (int)offset);
170
        hw_error("pl031_write: Bad offset 0x%x\n", (int)offset);
173 171
        break;
174 172
    }
175 173
}
......
195 193
    s = qemu_mallocz(sizeof(pl031_state));
196 194

  
197 195
    iomemtype = cpu_register_io_memory(0, pl031_readfn, pl031_writefn, s);
198
    if (iomemtype == -1)
199
        cpu_abort(cpu_single_env, "pl031_init: Can't register I/O memory\n");
196
    if (iomemtype == -1) {
197
        hw_error("pl031_init: Can't register I/O memory\n");
198
    }
200 199

  
201 200
    cpu_register_physical_memory(base, 0x00001000, iomemtype);
202 201

  

Also available in: Unified diff