* [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling
@ 2014-02-19 18:30 Don Slutz
2014-02-25 0:13 ` Don Slutz
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Don Slutz @ 2014-02-19 18:30 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Crosthwaite, Don Slutz
The commit 88c1ee73d3231c74ff90bcfc084a7589670ec244
char/serial: Fix emptyness check
Still causes extra NULL byte(s) to be sent.
So if the fifo is empty, do not send an extra NULL byte.
Signed-off-by: Don Slutz <dslutz@verizon.com>
---
hw/char/serial.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 6d3b5af..6df5a53 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -225,8 +225,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque)
if (s->tsr_retry <= 0) {
if (s->fcr & UART_FCR_FE) {
- s->tsr = fifo8_is_empty(&s->xmit_fifo) ?
- 0 : fifo8_pop(&s->xmit_fifo);
+ if (fifo8_is_empty(&s->xmit_fifo))
+ return FALSE;
+ s->tsr = fifo8_pop(&s->xmit_fifo);
if (!s->xmit_fifo.num) {
s->lsr |= UART_LSR_THRE;
}
--
1.8.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling
2014-02-19 18:30 [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling Don Slutz
@ 2014-02-25 0:13 ` Don Slutz
2014-03-17 22:52 ` Peter Crosthwaite
2014-03-17 23:02 ` Peter Crosthwaite
2 siblings, 0 replies; 5+ messages in thread
From: Don Slutz @ 2014-02-25 0:13 UTC (permalink / raw)
To: Don Slutz, qemu-devel; +Cc: Peter Crosthwaite
On 02/19/14 13:30, Don Slutz wrote:
> The commit 88c1ee73d3231c74ff90bcfc084a7589670ec244
> char/serial: Fix emptyness check
>
> Still causes extra NULL byte(s) to be sent.
>
> So if the fifo is empty, do not send an extra NULL byte.
>
> Signed-off-by: Don Slutz <dslutz@verizon.com>
> ---
> hw/char/serial.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index 6d3b5af..6df5a53 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -225,8 +225,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque)
>
> if (s->tsr_retry <= 0) {
> if (s->fcr & UART_FCR_FE) {
> - s->tsr = fifo8_is_empty(&s->xmit_fifo) ?
> - 0 : fifo8_pop(&s->xmit_fifo);
> + if (fifo8_is_empty(&s->xmit_fifo))
> + return FALSE;
> + s->tsr = fifo8_pop(&s->xmit_fifo);
> if (!s->xmit_fifo.num) {
> s->lsr |= UART_LSR_THRE;
> }
Since I sent this out, I have wondered if:
s->lsr |= UART_LSR_THRE
Also needs to be done.
-Don Slutz
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling
2014-02-19 18:30 [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling Don Slutz
2014-02-25 0:13 ` Don Slutz
@ 2014-03-17 22:52 ` Peter Crosthwaite
2014-03-17 23:02 ` Peter Crosthwaite
2 siblings, 0 replies; 5+ messages in thread
From: Peter Crosthwaite @ 2014-03-17 22:52 UTC (permalink / raw)
To: Don Slutz; +Cc: qemu-devel@nongnu.org Developers
On Thu, Feb 20, 2014 at 4:30 AM, Don Slutz <dslutz@verizon.com> wrote:
> The commit 88c1ee73d3231c74ff90bcfc084a7589670ec244
> char/serial: Fix emptyness check
>
> Still causes extra NULL byte(s) to be sent.
>
> So if the fifo is empty, do not send an extra NULL byte.
>
> Signed-off-by: Don Slutz <dslutz@verizon.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> ---
> hw/char/serial.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index 6d3b5af..6df5a53 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -225,8 +225,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque)
>
> if (s->tsr_retry <= 0) {
> if (s->fcr & UART_FCR_FE) {
> - s->tsr = fifo8_is_empty(&s->xmit_fifo) ?
> - 0 : fifo8_pop(&s->xmit_fifo);
> + if (fifo8_is_empty(&s->xmit_fifo))
> + return FALSE;
> + s->tsr = fifo8_pop(&s->xmit_fifo);
> if (!s->xmit_fifo.num) {
> s->lsr |= UART_LSR_THRE;
> }
> --
> 1.8.4
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling
2014-02-19 18:30 [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling Don Slutz
2014-02-25 0:13 ` Don Slutz
2014-03-17 22:52 ` Peter Crosthwaite
@ 2014-03-17 23:02 ` Peter Crosthwaite
2014-03-18 16:27 ` Don Slutz
2 siblings, 1 reply; 5+ messages in thread
From: Peter Crosthwaite @ 2014-03-17 23:02 UTC (permalink / raw)
To: Don Slutz; +Cc: qemu-devel@nongnu.org Developers
On Thu, Feb 20, 2014 at 4:30 AM, Don Slutz <dslutz@verizon.com> wrote:
> The commit 88c1ee73d3231c74ff90bcfc084a7589670ec244
> char/serial: Fix emptyness check
>
> Still causes extra NULL byte(s) to be sent.
>
> So if the fifo is empty, do not send an extra NULL byte.
>
> Signed-off-by: Don Slutz <dslutz@verizon.com>
> ---
> hw/char/serial.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index 6d3b5af..6df5a53 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -225,8 +225,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque)
>
> if (s->tsr_retry <= 0) {
> if (s->fcr & UART_FCR_FE) {
> - s->tsr = fifo8_is_empty(&s->xmit_fifo) ?
> - 0 : fifo8_pop(&s->xmit_fifo);
> + if (fifo8_is_empty(&s->xmit_fifo))
> + return FALSE;
If should have braces. The file in ancient and has many violations,
but we are trying to update whenever we touch code as we go.
Regards,
Peter
> + s->tsr = fifo8_pop(&s->xmit_fifo);
> if (!s->xmit_fifo.num) {
> s->lsr |= UART_LSR_THRE;
> }
> --
> 1.8.4
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling
2014-03-17 23:02 ` Peter Crosthwaite
@ 2014-03-18 16:27 ` Don Slutz
0 siblings, 0 replies; 5+ messages in thread
From: Don Slutz @ 2014-03-18 16:27 UTC (permalink / raw)
To: Peter Crosthwaite, Don Slutz; +Cc: qemu-devel@nongnu.org Developers
On 03/17/14 19:02, Peter Crosthwaite wrote:
> On Thu, Feb 20, 2014 at 4:30 AM, Don Slutz <dslutz@verizon.com> wrote:
>> The commit 88c1ee73d3231c74ff90bcfc084a7589670ec244
>> char/serial: Fix emptyness check
>>
>> Still causes extra NULL byte(s) to be sent.
>>
>> So if the fifo is empty, do not send an extra NULL byte.
>>
>> Signed-off-by: Don Slutz <dslutz@verizon.com>
>> ---
>> hw/char/serial.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/char/serial.c b/hw/char/serial.c
>> index 6d3b5af..6df5a53 100644
>> --- a/hw/char/serial.c
>> +++ b/hw/char/serial.c
>> @@ -225,8 +225,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque)
>>
>> if (s->tsr_retry <= 0) {
>> if (s->fcr & UART_FCR_FE) {
>> - s->tsr = fifo8_is_empty(&s->xmit_fifo) ?
>> - 0 : fifo8_pop(&s->xmit_fifo);
>> + if (fifo8_is_empty(&s->xmit_fifo))
>> + return FALSE;
> If should have braces. The file in ancient and has many violations,
> but we are trying to update whenever we touch code as we go.
>
> Regards,
> Peter
Yes, I have been working a lot on Xen and their coding style is the inverse and no checkpatch...
As expected this is reported:
WARNING: braces {} are necessary for all arms of this statement
#28: FILE: hw/char/serial.c:228:
+ if (fifo8_is_empty(&s->xmit_fifo))
v3 on its way.
-Don Slutz
>> + s->tsr = fifo8_pop(&s->xmit_fifo);
>> if (!s->xmit_fifo.num) {
>> s->lsr |= UART_LSR_THRE;
>> }
>> --
>> 1.8.4
>>
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-18 16:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-19 18:30 [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling Don Slutz
2014-02-25 0:13 ` Don Slutz
2014-03-17 22:52 ` Peter Crosthwaite
2014-03-17 23:02 ` Peter Crosthwaite
2014-03-18 16:27 ` Don Slutz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).