Re: [Qemu-devel] [PATCH] usb-serial: Fail instead of crash when chardev is missing

[Aurelien Jarno]

On Fri, May 28, 2010 at 05:03:22PM +0200, Markus Armbruster wrote:
> 
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  hw/usb-serial.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)

Thanks, applied.

> diff --git a/hw/usb-serial.c b/hw/usb-serial.c
> index 5b2483a..c19580f 100644
> --- a/hw/usb-serial.c
> +++ b/hw/usb-serial.c
> @@ -545,6 +545,11 @@ static int usb_serial_initfn(USBDevice *dev)
>      USBSerialState *s = DO_UPCAST(USBSerialState, dev, dev);
>      s->dev.speed = USB_SPEED_FULL;
>  
> +    if (!s->cs) {
> +        error_report("Property chardev is required");
> +        return -1;
> +    }
> +
>      qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read,
>                            usb_serial_event, s);
>      usb_serial_handle_reset(dev);
> -- 
> 1.6.6.1
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
address@hidden                 http://www.aurel32.net