aboutsummaryrefslogtreecommitdiff
path: root/hw/omap2.c
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-18 14:08:04 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-18 14:08:04 +0000
commitceecf1d158d324c61a7ec1ba5de57dbc8a0f8373 (patch)
treebb58577711ef3fedae6ebbe731ac4da7f2d85bde /hw/omap2.c
parent9c554c1c0b01642c39232489cef8301a7858824d (diff)
downloadqemu-ceecf1d158d324c61a7ec1ba5de57dbc8a0f8373.zip
qemu-ceecf1d158d324c61a7ec1ba5de57dbc8a0f8373.tar.gz
qemu-ceecf1d158d324c61a7ec1ba5de57dbc8a0f8373.tar.bz2
add an init function parameter to qemu_chr_open()
And use it for the malta emulation. Fix segfault introduced in revision 6352. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6365 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/omap2.c')
-rw-r--r--hw/omap2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/omap2.c b/hw/omap2.c
index b9f7706..20b3811 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -2161,7 +2161,7 @@ static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta,
s->irq = irq;
omap_sti_reset(s);
- s->chr = chr ?: qemu_chr_open("null", "null");
+ s->chr = chr ?: qemu_chr_open("null", "null", NULL);
iomemtype = l4_register_io_memory(0, omap_sti_readfn,
omap_sti_writefn, s);