Commit 8c95e1f2 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

cg3: 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: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent be4221d9

hw/display/cg3.c

+1 −3
Original line number Diff line number Diff line
@@ -303,8 +303,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) 
    vmstate_register_ram_global(&s->rom);

    fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, CG3_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("cg3: could not load prom '%s'", CG3_ROM_FILE);
@@ -369,7 +368,6 @@ static Property cg3_properties[] = { 
    DEFINE_PROP_UINT16("width",        CG3State, width,     -1),

    DEFINE_PROP_UINT16("height",       CG3State, height,    -1),

    DEFINE_PROP_UINT16("depth",        CG3State, depth,     -1),

    DEFINE_PROP_UINT64("prom-addr",    CG3State, prom_addr, -1),

    DEFINE_PROP_END_OF_LIST(),

};

hw/sparc/sun4m.c

+0 −1
Original line number Diff line number Diff line
@@ -544,7 +544,6 @@ static void cg3_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);