| Message ID | 1491381329-3995-15-git-send-email-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
On 04/05/2017 05:35 AM, Mark Cave-Ayland wrote: > Previous to the existence of load_image_mr(), the only way to load in the > FCode ROM image was to pass in its physical address via qdev properties > and use load_image_targphys(). > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/display/tcx.c | 4 +--- > hw/sparc/sun4m.c | 1 - > 2 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/hw/display/tcx.c b/hw/display/tcx.c > index 3f00735..5a1115c 100644 > --- a/hw/display/tcx.c > +++ b/hw/display/tcx.c > @@ -843,8 +843,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp) > vmstate_register_ram_global(&s->rom); > fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE); > if (fcode_filename) { > - ret = load_image_targphys(fcode_filename, s->prom_addr, > - FCODE_MAX_ROM_SIZE); > + ret = load_image_mr(fcode_filename, &s->rom); > g_free(fcode_filename); > if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) { > error_report("tcx: could not load prom '%s'", TCX_ROM_FILE); > @@ -902,7 +901,6 @@ static Property tcx_properties[] = { > DEFINE_PROP_UINT16("width", TCXState, width, -1), > DEFINE_PROP_UINT16("height", TCXState, height, -1), > DEFINE_PROP_UINT16("depth", TCXState, depth, -1), > - DEFINE_PROP_UINT64("prom_addr", TCXState, prom_addr, -1), > DEFINE_PROP_END_OF_LIST(), > }; > > diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c > index 7a0922b..5f022cc 100644 > --- a/hw/sparc/sun4m.c > +++ b/hw/sparc/sun4m.c > @@ -491,7 +491,6 @@ static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width, > qdev_prop_set_uint16(dev, "width", width); > qdev_prop_set_uint16(dev, "height", height); > qdev_prop_set_uint16(dev, "depth", depth); > - qdev_prop_set_uint64(dev, "prom_addr", addr); > qdev_init_nofail(dev); > s = SYS_BUS_DEVICE(dev); > >
diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 3f00735..5a1115c 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -843,8 +843,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp) vmstate_register_ram_global(&s->rom); fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE); if (fcode_filename) { - ret = load_image_targphys(fcode_filename, s->prom_addr, - FCODE_MAX_ROM_SIZE); + ret = load_image_mr(fcode_filename, &s->rom); g_free(fcode_filename); if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) { error_report("tcx: could not load prom '%s'", TCX_ROM_FILE); @@ -902,7 +901,6 @@ static Property tcx_properties[] = { DEFINE_PROP_UINT16("width", TCXState, width, -1), DEFINE_PROP_UINT16("height", TCXState, height, -1), DEFINE_PROP_UINT16("depth", TCXState, depth, -1), - DEFINE_PROP_UINT64("prom_addr", TCXState, prom_addr, -1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 7a0922b..5f022cc 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -491,7 +491,6 @@ static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width, qdev_prop_set_uint16(dev, "width", width); qdev_prop_set_uint16(dev, "height", height); qdev_prop_set_uint16(dev, "depth", depth); - qdev_prop_set_uint64(dev, "prom_addr", addr); qdev_init_nofail(dev); s = SYS_BUS_DEVICE(dev);
Previous to the existence of load_image_mr(), the only way to load in the FCode ROM image was to pass in its physical address via qdev properties and use load_image_targphys(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/display/tcx.c | 4 +--- hw/sparc/sun4m.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)