Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
hw
/
display
/
tcx.c
diff --git
a/qemu/hw/display/tcx.c
b/qemu/hw/display/tcx.c
index
6acdc2d
..
8e26aae
100644
(file)
--- a/
qemu/hw/display/tcx.c
+++ b/
qemu/hw/display/tcx.c
@@
-22,7
+22,10
@@
* THE SOFTWARE.
*/
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu-common.h"
+#include "cpu.h" /* FIXME shouldn't use TARGET_PAGE_SIZE */
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "hw/loader.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "hw/loader.h"
@@
-944,57
+947,55
@@
static void tcx_initfn(Object *obj)
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
TCXState *s = TCX(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
TCXState *s = TCX(obj);
- memory_region_init_ram(&s->rom,
NULL
, "tcx.prom", FCODE_MAX_ROM_SIZE,
- &error_
abort
);
+ memory_region_init_ram(&s->rom,
obj
, "tcx.prom", FCODE_MAX_ROM_SIZE,
+ &error_
fatal
);
memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom);
/* 2/STIP : Stippler */
memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom);
/* 2/STIP : Stippler */
- memory_region_init_io(&s->stip,
OBJECT(s)
, &tcx_stip_ops, s, "tcx.stip",
+ memory_region_init_io(&s->stip,
obj
, &tcx_stip_ops, s, "tcx.stip",
TCX_STIP_NREGS);
sysbus_init_mmio(sbd, &s->stip);
/* 3/BLIT : Blitter */
TCX_STIP_NREGS);
sysbus_init_mmio(sbd, &s->stip);
/* 3/BLIT : Blitter */
- memory_region_init_io(&s->blit,
OBJECT(s)
, &tcx_blit_ops, s, "tcx.blit",
+ memory_region_init_io(&s->blit,
obj
, &tcx_blit_ops, s, "tcx.blit",
TCX_BLIT_NREGS);
sysbus_init_mmio(sbd, &s->blit);
/* 5/RSTIP : Raw Stippler */
TCX_BLIT_NREGS);
sysbus_init_mmio(sbd, &s->blit);
/* 5/RSTIP : Raw Stippler */
- memory_region_init_io(&s->rstip,
OBJECT(s)
, &tcx_rstip_ops, s, "tcx.rstip",
+ memory_region_init_io(&s->rstip,
obj
, &tcx_rstip_ops, s, "tcx.rstip",
TCX_RSTIP_NREGS);
sysbus_init_mmio(sbd, &s->rstip);
/* 6/RBLIT : Raw Blitter */
TCX_RSTIP_NREGS);
sysbus_init_mmio(sbd, &s->rstip);
/* 6/RBLIT : Raw Blitter */
- memory_region_init_io(&s->rblit,
OBJECT(s)
, &tcx_rblit_ops, s, "tcx.rblit",
+ memory_region_init_io(&s->rblit,
obj
, &tcx_rblit_ops, s, "tcx.rblit",
TCX_RBLIT_NREGS);
sysbus_init_mmio(sbd, &s->rblit);
/* 7/TEC : ??? */
TCX_RBLIT_NREGS);
sysbus_init_mmio(sbd, &s->rblit);
/* 7/TEC : ??? */
- memory_region_init_io(&s->tec,
OBJECT(s), &tcx_dummy_ops, s
,
-
"tcx.tec",
TCX_TEC_NREGS);
+ memory_region_init_io(&s->tec,
obj, &tcx_dummy_ops, s, "tcx.tec"
,
+ TCX_TEC_NREGS);
sysbus_init_mmio(sbd, &s->tec);
/* 8/CMAP : DAC */
sysbus_init_mmio(sbd, &s->tec);
/* 8/CMAP : DAC */
- memory_region_init_io(&s->dac,
OBJECT(s), &tcx_dac_ops, s
,
-
"tcx.dac",
TCX_DAC_NREGS);
+ memory_region_init_io(&s->dac,
obj, &tcx_dac_ops, s, "tcx.dac"
,
+ TCX_DAC_NREGS);
sysbus_init_mmio(sbd, &s->dac);
/* 9/THC : Cursor */
sysbus_init_mmio(sbd, &s->dac);
/* 9/THC : Cursor */
- memory_region_init_io(&s->thc,
OBJECT(s)
, &tcx_thc_ops, s, "tcx.thc",
+ memory_region_init_io(&s->thc,
obj
, &tcx_thc_ops, s, "tcx.thc",
TCX_THC_NREGS);
sysbus_init_mmio(sbd, &s->thc);
/* 11/DHC : ??? */
TCX_THC_NREGS);
sysbus_init_mmio(sbd, &s->thc);
/* 11/DHC : ??? */
- memory_region_init_io(&s->dhc,
OBJECT(s)
, &tcx_dummy_ops, s, "tcx.dhc",
+ memory_region_init_io(&s->dhc,
obj
, &tcx_dummy_ops, s, "tcx.dhc",
TCX_DHC_NREGS);
sysbus_init_mmio(sbd, &s->dhc);
/* 12/ALT : ??? */
TCX_DHC_NREGS);
sysbus_init_mmio(sbd, &s->dhc);
/* 12/ALT : ??? */
- memory_region_init_io(&s->alt,
OBJECT(s)
, &tcx_dummy_ops, s, "tcx.alt",
+ memory_region_init_io(&s->alt,
obj
, &tcx_dummy_ops, s, "tcx.alt",
TCX_ALT_NREGS);
sysbus_init_mmio(sbd, &s->alt);
TCX_ALT_NREGS);
sysbus_init_mmio(sbd, &s->alt);
-
- return;
}
static void tcx_realizefn(DeviceState *dev, Error **errp)
}
static void tcx_realizefn(DeviceState *dev, Error **errp)
@@
-1007,7
+1008,7
@@
static void tcx_realizefn(DeviceState *dev, Error **errp)
char *fcode_filename;
memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
char *fcode_filename;
memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
- s->vram_size * (1 + 4 + 4), &error_
abort
);
+ s->vram_size * (1 + 4 + 4), &error_
fatal
);
vmstate_register_ram_global(&s->vram_mem);
memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA);
vram_base = memory_region_get_ram_ptr(&s->vram_mem);
vmstate_register_ram_global(&s->vram_mem);
memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA);
vram_base = memory_region_get_ram_ptr(&s->vram_mem);