summaryrefslogtreecommitdiffstats
path: root/hw/mips
diff options
context:
space:
mode:
authorPeter Maydell2017-12-13 18:52:29 +0100
committerPaolo Bonzini2017-12-21 09:30:32 +0100
commit5fb3d632884cbc113d9d13b1c8b0c5f2a8c7bc0d (patch)
tree0c57bae3d1a04a4cd961427939d891064129e99f /hw/mips
parentexec: Don't reuse unassigned_mem_ops for io_mem_rom (diff)
downloadqemu-5fb3d632884cbc113d9d13b1c8b0c5f2a8c7bc0d.tar.gz
qemu-5fb3d632884cbc113d9d13b1c8b0c5f2a8c7bc0d.tar.xz
qemu-5fb3d632884cbc113d9d13b1c8b0c5f2a8c7bc0d.zip
hw/mips/boston: Remove workaround for writes to ROM aborting
Now that the memory system correctly handles writes to ROM for guest CPUs that may generate exceptions for decode errors, we can remove the workaround from the boston board. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <1513187549-2435-3-git-send-email-peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips')
-rw-r--r--hw/mips/boston.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 1cb4b6aca2..fb23161b33 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -248,16 +248,6 @@ static const MemoryRegionOps boston_platreg_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static void boston_flash_write(void *opaque, hwaddr addr,
- uint64_t val, unsigned size)
-{
-}
-
-static const MemoryRegionOps boston_flash_ops = {
- .write = boston_flash_write,
- .endianness = DEVICE_NATIVE_ENDIAN,
-};
-
static const TypeInfo boston_device = {
.name = TYPE_MIPS_BOSTON,
.parent = TYPE_SYS_BUS_DEVICE,
@@ -481,8 +471,8 @@ static void boston_mach_init(MachineState *machine)
sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1);
flash = g_new(MemoryRegion, 1);
- memory_region_init_rom_device_nomigrate(flash, NULL, &boston_flash_ops, s,
- "boston.flash", 128 * M_BYTE, &err);
+ memory_region_init_rom_nomigrate(flash, NULL,
+ "boston.flash", 128 * M_BYTE, &err);
memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0);
ddr = g_new(MemoryRegion, 1);