From 81bf96d3d299a7f88bf3e2ece4f795a9949db5f7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 28 May 2010 17:03:22 +0200 Subject: [PATCH] usb-serial: Fail instead of crash when chardev is missing Signed-off-by: Markus Armbruster Acked-by: Gerd Hoffmann Signed-off-by: Aurelien Jarno --- hw/usb-serial.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/usb-serial.c b/hw/usb-serial.c index 5b2483ab44..c19580f305 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);