diff options
| author | Mark Cave-Ayland | 2017-04-05 10:02:47 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland | 2017-04-21 10:02:04 +0200 |
| commit | 749763864208b14f100f1f8319aeb931134430fa (patch) | |
| tree | 321278a04e4b1fc20710fb9bfd1a6bcfca3ce92d /hw/display/tcx.c | |
| parent | tcx: use tcx_set_dirty() for accelerated ops (diff) | |
| download | qemu-749763864208b14f100f1f8319aeb931134430fa.tar.gz qemu-749763864208b14f100f1f8319aeb931134430fa.tar.xz qemu-749763864208b14f100f1f8319aeb931134430fa.zip | |
tcx: switch to load_image_mr() and remove prom_addr hack
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: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display/tcx.c')
| -rw-r--r-- | hw/display/tcx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 3f007351d2..5a1115cc65 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(), }; |