[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/13] cg3: switch to load_image_mr() and remove
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH v2 03/13] cg3: switch to load_image_mr() and remove prom-addr hack |
Date: |
Fri, 21 Apr 2017 09:28:37 +0100 |
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 <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/display/cg3.c | 4 +---
hw/sparc/sun4m.c | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index b42f60e..03d9197 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -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(),
};
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 873cd7d..7a0922b 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -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);
--
1.7.10.4
- [Qemu-devel] [PATCH v2 00/13] TCX/CG3 adapter cleanups, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 09/13] tcx: remove TARGET_PAGE_SIZE from tcx_update_display(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 08/13] tcx: remove page24 and cpage from tcx24_update_display(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 02/13] cg3: fix up size parameter for memory_region_get_dirty(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 06/13] tcx: alter tcx24_check_dirty() to accept address and length parameters, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 04/13] tcx: alter tcx_set_dirty() to accept address and length parameters, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 05/13] tcx: ensure tcx_set_dirty() also invalidates the 24-bit plane and cplane, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 07/13] tcx: alter tcx24_reset_dirty() to accept address and length parameters, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 01/13] cg3: remove TARGET_PAGE_SIZE rounding on dirty page detection, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 03/13] cg3: switch to load_image_mr() and remove prom-addr hack,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH v2 11/13] tcx: remove primitives for non-32-bit surfaces, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 10/13] tcx: remove TARGET_PAGE_SIZE from tcx24_update_display(), Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 12/13] tcx: use tcx_set_dirty() for accelerated ops, Mark Cave-Ayland, 2017/04/21
- [Qemu-devel] [PATCH v2 13/13] tcx: switch to load_image_mr() and remove prom_addr hack, Mark Cave-Ayland, 2017/04/21