Received: from [140.186.70.92] (port=59473 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OU2A8-000559-CO for qemu-devel@nongnu.org; Wed, 30 Jun 2010 14:37:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OU29X-0005nu-3W for qemu-devel@nongnu.org; Wed, 30 Jun 2010 14:36:56 -0400 Received: from hall.aurel32.net ([88.191.82.174]:40347) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OU29W-0005nj-VQ for qemu-devel@nongnu.org; Wed, 30 Jun 2010 14:36:55 -0400 Date: Wed, 30 Jun 2010 20:36:45 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] usb-serial: Fail instead of crash when chardev is missing Message-ID: <20100630183645.GB24593@ohm.aurel32.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org, Gerd Hoffmann On Fri, May 28, 2010 at 05:03:22PM +0200, Markus Armbruster wrote: > > Signed-off-by: Markus Armbruster > --- > 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 aurelien@aurel32.net http://www.aurel32.net