From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Um2DI-0008OE-DU for qemu-devel@nongnu.org; Mon, 10 Jun 2013 09:32:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Um2DF-0008Qy-Ey for qemu-devel@nongnu.org; Mon, 10 Jun 2013 09:32:48 -0400 Message-ID: <51B5D57B.7040006@suse.de> Date: Mon, 10 Jun 2013 15:32:43 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v1 1/3] char/serial: cosmetic fixes. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.crosthwaite@xilinx.com Cc: qemu-trivial@nongnu.org, edgar.iglesias@gmail.com, aliguori@us.ibm.com, qemu-devel@nongnu.org Hi Peter, Am 03.06.2013 07:12, schrieb peter.crosthwaite@xilinx.com: > From: Peter Crosthwaite >=20 > Some cosmetic fixes to char/serial fixing some checkpatch errors. >=20 > Cc: qemu-trivial@nongnu.org >=20 > Signed-off-by: Peter Crosthwaite > --- > Needed for the next patch to pass checkpatch. Done as sep patch to not > obscure that patch. >=20 > hw/char/serial.c | 30 +++++++++++++++++++----------- > 1 file changed, 19 insertions(+), 11 deletions(-) >=20 > diff --git a/hw/char/serial.c b/hw/char/serial.c > index 66b6348..bd6813e 100644 > --- a/hw/char/serial.c > +++ b/hw/char/serial.c > @@ -263,8 +263,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCo= ndition cond, void *opaque) > if (s->tsr_retry <=3D 0) { > if (s->fcr & UART_FCR_FE) { > s->tsr =3D fifo_get(s,XMIT_FIFO); > - if (!s->xmit_fifo.count) > + if (!s->xmit_fifo.count) { > s->lsr |=3D UART_LSR_THRE; > + } > } else if ((s->lsr & UART_LSR_THRE)) { > return FALSE; > } else { > @@ -461,10 +462,11 @@ static uint64_t serial_ioport_read(void *opaque, = hwaddr addr, unsigned size) > } else { > if(s->fcr & UART_FCR_FE) { > ret =3D fifo_get(s,RECV_FIFO); > - if (s->recv_fifo.count =3D=3D 0) > + if (s->recv_fifo.count =3D=3D 0) { > s->lsr &=3D ~(UART_LSR_DR | UART_LSR_BI); > - else > + } else { > qemu_mod_timer(s->fifo_timeout_timer, qemu_get_clo= ck_ns (vm_clock) + s->char_transmit_time * 4); Wanna rebreak this one too in case you respin/pull? > + } > s->timeout_ipending =3D 0; > } else { > ret =3D s->rbr; > @@ -534,15 +536,21 @@ static uint64_t serial_ioport_read(void *opaque, = hwaddr addr, unsigned size) > static int serial_can_receive(SerialState *s) > { > if(s->fcr & UART_FCR_FE) { > - if(s->recv_fifo.count < UART_FIFO_LENGTH) > - /* Advertise (fifo.itl - fifo.count) bytes when count < ITL, a= nd 1 if above. If UART_FIFO_LENGTH - fifo.count is > - advertised the effect will be to almost always fill the fifo c= ompletely before the guest has a chance to respond, > - effectively overriding the ITL that the guest has set. */ > - return (s->recv_fifo.count <=3D s->recv_fifo.itl) ? s->re= cv_fifo.itl - s->recv_fifo.count : 1; > - else > - return 0; > + if (s->recv_fifo.count < UART_FIFO_LENGTH) { > + /* > + * Advertise (fifo.itl - fifo.count) bytes when count < IT= L, and 1 > + * if above. If UART_FIFO_LENGTH - fifo.count is advertise= d the > + * effect will be to almost always fill the fifo completel= y before > + * the guest has a chance to respond, effectively overridi= ng the ITL > + * that the guest has set. > + */ > + return (s->recv_fifo.count <=3D s->recv_fifo.itl) ? > + s->recv_fifo.itl - s->recv_fifo.count : 1; Here I stumbled over the indentation being 5 chars from '(' or 4 chars within, but the latter doesn't make sense since it's terminated before. I would've expected 4 chars from block or aligned below '(' or 4-char-indented from there. But I'm not sure if there are any clear recommendations, so since it's apparently not using tabs (my initial suspicion), no objection. Cheers, Andreas > + } else { > + return 0; > + } > } else { > - return !(s->lsr & UART_LSR_DR); > + return !(s->lsr & UART_LSR_DR); > } > } > =20 >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg