Received: from [140.186.70.92] (port=38366 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI15r-0006JV-Vg for qemu-devel@nongnu.org; Fri, 28 May 2010 11:03:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OI15q-0007N4-Bu for qemu-devel@nongnu.org; Fri, 28 May 2010 11:03:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34916) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OI15q-0007Mv-3k for qemu-devel@nongnu.org; Fri, 28 May 2010 11:03:26 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4SF3O2B007690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 28 May 2010 11:03:24 -0400 From: Markus Armbruster Date: Fri, 28 May 2010 17:03:22 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] [PATCH] usb-serial: Fail instead of crash when chardev is missing List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster --- hw/usb-serial.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) 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