From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b85Ly-0007ym-IW for qemu-devel@nongnu.org; Wed, 01 Jun 2016 08:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b85Lv-0002Fx-Dh for qemu-devel@nongnu.org; Wed, 01 Jun 2016 08:34:30 -0400 Received: from chuckie.co.uk ([82.165.15.123]:50033 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b85Lv-0002Fi-5t for qemu-devel@nongnu.org; Wed, 01 Jun 2016 08:34:27 -0400 References: <1464767898-30526-1-git-send-email-zxq_yx_007@163.com> From: Mark Cave-Ayland Message-ID: <574ED627.9020402@ilande.co.uk> Date: Wed, 1 Jun 2016 13:33:43 +0100 MIME-Version: 1.0 In-Reply-To: <1464767898-30526-1-git-send-email-zxq_yx_007@163.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] hw/char: QOM'ify escc.c (fix) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: xiaoqiang zhao , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.maydell@linaro.org, michael@walle.cc, edgar.iglesias@gmail.com, armbru@redhat.com On 01/06/16 08:58, xiaoqiang zhao wrote: > 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 > --- > 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; Should this not still be in escc_init1() since s->frequency is set by a property? > qemu_chr_add_handlers(s->chn[i].chr, serial_can_receive, > serial_receive1, serial_event, &s->chn[i]); > } > Otherwise, thanks for the patch - I'll try it this evening on both qemu-system-ppc and qemu-system-sparc since both of them use ESCC serial ports and report back. ATB, Mark.