* [Qemu-devel] [PATCH] cadence_uart: check for serial backend before using it.
@ 2014-07-15 15:18 fred.konrad
2014-07-16 3:48 ` Peter Crosthwaite
0 siblings, 1 reply; 3+ messages in thread
From: fred.konrad @ 2014-07-15 15:18 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, peter.crosthwaite, mark.burton, fred.konrad
From: KONRAD Frederic <fred.konrad@greensocs.com>
This checks that s->chr is not NULL before using it.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
---
hw/char/cadence_uart.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index dbbc167..a5736cb 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -175,8 +175,10 @@ static void uart_send_breaks(UartState *s)
{
int break_enabled = 1;
- qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK,
- &break_enabled);
+ if (s->chr) {
+ qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK,
+ &break_enabled);
+ }
}
static void uart_parameters_setup(UartState *s)
@@ -227,7 +229,9 @@ static void uart_parameters_setup(UartState *s)
packet_size += ssp.data_bits + ssp.stop_bits;
s->char_tx_time = (get_ticks_per_sec() / ssp.speed) * packet_size;
- qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
+ if (s->chr) {
+ qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
+ }
}
static int uart_can_receive(void *opaque)
@@ -295,6 +299,7 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond,
/* instant drain the fifo when there's no back-end */
if (!s->chr) {
s->tx_count = 0;
+ return FALSE;
}
if (!s->tx_count) {
@@ -375,7 +380,9 @@ static void uart_read_rx_fifo(UartState *s, uint32_t *c)
*c = s->rx_fifo[rx_rpos];
s->rx_count--;
- qemu_chr_accept_input(s->chr);
+ if (s->chr) {
+ qemu_chr_accept_input(s->chr);
+ }
} else {
*c = 0;
}
--
1.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] cadence_uart: check for serial backend before using it.
2014-07-15 15:18 [Qemu-devel] [PATCH] cadence_uart: check for serial backend before using it fred.konrad
@ 2014-07-16 3:48 ` Peter Crosthwaite
2014-07-16 7:04 ` Frederic Konrad
0 siblings, 1 reply; 3+ messages in thread
From: Peter Crosthwaite @ 2014-07-16 3:48 UTC (permalink / raw)
To: Fréderic Konrad
Cc: Peter Maydell, mark.burton, qemu-devel@nongnu.org Developers
On Wed, Jul 16, 2014 at 1:18 AM, <fred.konrad@greensocs.com> wrote:
> From: KONRAD Frederic <fred.konrad@greensocs.com>
>
> This checks that s->chr is not NULL before using it.
>
> Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
> ---
> hw/char/cadence_uart.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
> index dbbc167..a5736cb 100644
> --- a/hw/char/cadence_uart.c
> +++ b/hw/char/cadence_uart.c
> @@ -175,8 +175,10 @@ static void uart_send_breaks(UartState *s)
> {
> int break_enabled = 1;
>
> - qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK,
> - &break_enabled);
> + if (s->chr) {
> + qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK,
> + &break_enabled);
> + }
> }
>
> static void uart_parameters_setup(UartState *s)
> @@ -227,7 +229,9 @@ static void uart_parameters_setup(UartState *s)
>
> packet_size += ssp.data_bits + ssp.stop_bits;
> s->char_tx_time = (get_ticks_per_sec() / ssp.speed) * packet_size;
> - qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
> + if (s->chr) {
> + qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
> + }
> }
>
> static int uart_can_receive(void *opaque)
> @@ -295,6 +299,7 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond,
> /* instant drain the fifo when there's no back-end */
> if (!s->chr) {
> s->tx_count = 0;
> + return FALSE;
Is this needed? With s->tx_count forced to 0 in the NULL dev case,
won't the next if trigger immediately and return?
300 if (!s->tx_count) {
301 return FALSE;
302 }
With this hunk dropped,
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
And recommended for 2.1.
Regards,
Peter
> }
>
> if (!s->tx_count) {
> @@ -375,7 +380,9 @@ static void uart_read_rx_fifo(UartState *s, uint32_t *c)
> *c = s->rx_fifo[rx_rpos];
> s->rx_count--;
>
> - qemu_chr_accept_input(s->chr);
> + if (s->chr) {
> + qemu_chr_accept_input(s->chr);
> + }
> } else {
> *c = 0;
> }
> --
> 1.9.0
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] cadence_uart: check for serial backend before using it.
2014-07-16 3:48 ` Peter Crosthwaite
@ 2014-07-16 7:04 ` Frederic Konrad
0 siblings, 0 replies; 3+ messages in thread
From: Frederic Konrad @ 2014-07-16 7:04 UTC (permalink / raw)
To: Peter Crosthwaite
Cc: Peter Maydell, mark.burton, qemu-devel@nongnu.org Developers
On 16/07/2014 05:48, Peter Crosthwaite wrote:
> On Wed, Jul 16, 2014 at 1:18 AM, <fred.konrad@greensocs.com> wrote:
>> From: KONRAD Frederic <fred.konrad@greensocs.com>
>>
>> This checks that s->chr is not NULL before using it.
>>
>> Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
>> ---
>> hw/char/cadence_uart.c | 15 +++++++++++----
>> 1 file changed, 11 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
>> index dbbc167..a5736cb 100644
>> --- a/hw/char/cadence_uart.c
>> +++ b/hw/char/cadence_uart.c
>> @@ -175,8 +175,10 @@ static void uart_send_breaks(UartState *s)
>> {
>> int break_enabled = 1;
>>
>> - qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK,
>> - &break_enabled);
>> + if (s->chr) {
>> + qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK,
>> + &break_enabled);
>> + }
>> }
>>
>> static void uart_parameters_setup(UartState *s)
>> @@ -227,7 +229,9 @@ static void uart_parameters_setup(UartState *s)
>>
>> packet_size += ssp.data_bits + ssp.stop_bits;
>> s->char_tx_time = (get_ticks_per_sec() / ssp.speed) * packet_size;
>> - qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
>> + if (s->chr) {
>> + qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
>> + }
>> }
>>
>> static int uart_can_receive(void *opaque)
>> @@ -295,6 +299,7 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond,
>> /* instant drain the fifo when there's no back-end */
>> if (!s->chr) {
>> s->tx_count = 0;
>> + return FALSE;
> Is this needed? With s->tx_count forced to 0 in the NULL dev case,
> won't the next if trigger immediately and return?
True,
I'll make this change and resend.
Thanks,
Fred
>
> 300 if (!s->tx_count) {
> 301 return FALSE;
> 302 }
>
> With this hunk dropped,
>
> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>
> And recommended for 2.1.
>
> Regards,
> Peter
>
>> }
>>
>> if (!s->tx_count) {
>> @@ -375,7 +380,9 @@ static void uart_read_rx_fifo(UartState *s, uint32_t *c)
>> *c = s->rx_fifo[rx_rpos];
>> s->rx_count--;
>>
>> - qemu_chr_accept_input(s->chr);
>> + if (s->chr) {
>> + qemu_chr_accept_input(s->chr);
>> + }
>> } else {
>> *c = 0;
>> }
>> --
>> 1.9.0
>>
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-16 7:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-15 15:18 [Qemu-devel] [PATCH] cadence_uart: check for serial backend before using it fred.konrad
2014-07-16 3:48 ` Peter Crosthwaite
2014-07-16 7:04 ` Frederic Konrad
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).