[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] hw/char: QOM'ify escc.c (fix)
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/11] hw/char: QOM'ify escc.c (fix) |
Date: |
Mon, 6 Jun 2016 19:35:12 +0200 |
From: xiaoqiang zhao <address@hidden>
The previous commit e7c9136977cb99c6eb52c9139f7b8d8b5fa87db9
(hw/char: QOM'ify escc.c) cause qemu-system-ppc/ppc64
OpenBIOS to freeze on startup, this commit fix it.
Signed-off-by: xiaoqiang zhao <address@hidden>
Tested-by: Mark Cave-Ayland <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/char/escc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 8e6a7df..31a5f90 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -989,18 +989,13 @@ static void escc_init1(Object *obj)
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
unsigned int i;
- s->chn[0].disabled = s->disabled;
- s->chn[1].disabled = s->disabled;
for (i = 0; i < 2; i++) {
sysbus_init_irq(dev, &s->chn[i].irq);
s->chn[i].chn = 1 - i;
- s->chn[i].clock = s->frequency / 2;
}
s->chn[0].otherchn = &s->chn[1];
s->chn[1].otherchn = &s->chn[0];
- memory_region_init_io(&s->mmio, obj, &escc_mem_ops, s, "escc",
- ESCC_SIZE << s->it_shift);
sysbus_init_mmio(dev, &s->mmio);
}
@@ -1009,8 +1004,15 @@ static void escc_realize(DeviceState *dev, Error **errp)
ESCCState *s = ESCC(dev);
unsigned int i;
+ s->chn[0].disabled = s->disabled;
+ s->chn[1].disabled = s->disabled;
+
+ memory_region_init_io(&s->mmio, OBJECT(dev), &escc_mem_ops, s, "escc",
+ ESCC_SIZE << s->it_shift);
+
for (i = 0; i < 2; i++) {
if (s->chn[i].chr) {
+ s->chn[i].clock = s->frequency / 2;
qemu_chr_add_handlers(s->chn[i].chr, serial_can_receive,
serial_receive1, serial_event, &s->chn[i]);
}
--
2.5.5
- [Qemu-devel] [PULL 00/11] Misc changes for 2016-06-06, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 02/11] pc: allow raising low memory via max-ram-below-4g option, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 03/11] hw/char: QOM'ify escc.c (fix),
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/11] scsi: mark TYPE_SCSI_DISK_BASE as abstract, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 04/11] scsi: esp: check TI buffer index before read/write, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 01/11] tests: Rename tests/Makefile to tests/Makefile.include, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 09/11] vnc: list the 'to' parameter of '-vnc' in the qemu man page, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 10/11] Make avx2 configure test work with -O2, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 07/11] Makefile: Derive "PKGVERSION" from "git describe" by default, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 06/11] Makefile: Add a "FORCE" target, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 11/11] avx2 configure: Use primitives in test, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PULL 08/11] scsi-disk: add missing break, Paolo Bonzini, 2016/06/06
- Re: [Qemu-devel] [PULL 00/11] Misc changes for 2016-06-06, Peter Maydell, 2016/06/06