Message ID | 20200505101908.6207-9-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
уторак, 05. мај 2020., Markus Armbruster <armbru@redhat.com> је написао/ла: > Fixes: df1d8a1f29f567567b9d20be685a4241282e7005 > Cc: Paul Burton <pburton@wavecomp.com> > Cc: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > hw/mips/boston.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > Thank you, Markus, for spotting this error. Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> I am fine with you selecting this and another mips-related patch in this series in your pull request, that will be result of this series. Truly yours, Aleksandar > diff --git a/hw/mips/boston.c b/hw/mips/boston.c > index 2832dfa6ae..a896056be1 100644 > --- a/hw/mips/boston.c > +++ b/hw/mips/boston.c > @@ -426,7 +426,6 @@ static void boston_mach_init(MachineState *machine) > { > DeviceState *dev; > BostonState *s; > - Error *err = NULL; > MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg; > MemoryRegion *sys_mem = get_system_memory(); > XilinxPCIEHost *pcie2; > @@ -467,7 +466,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(flash, NULL, "boston.flash", 128 * MiB, &err); > + memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, > + &error_fatal); > memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); > > memory_region_add_subregion_overlap(sys_mem, 0x80000000, > machine->ram, 0); > -- > 2.21.1 > > >
diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 2832dfa6ae..a896056be1 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -426,7 +426,6 @@ static void boston_mach_init(MachineState *machine) { DeviceState *dev; BostonState *s; - Error *err = NULL; MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg; MemoryRegion *sys_mem = get_system_memory(); XilinxPCIEHost *pcie2; @@ -467,7 +466,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(flash, NULL, "boston.flash", 128 * MiB, &err); + memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, + &error_fatal); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); memory_region_add_subregion_overlap(sys_mem, 0x80000000, machine->ram, 0);
Fixes: df1d8a1f29f567567b9d20be685a4241282e7005 Cc: Paul Burton <pburton@wavecomp.com> Cc: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/mips/boston.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)