From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyu-0005sS-K5 for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWOyl-0002A3-L3 for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51490) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyl-00029E-Bx for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:13:59 -0400 From: Gerd Hoffmann Date: Tue, 23 Sep 2014 14:13:34 +0200 Message-Id: <1411474417-9704-24-git-send-email-kraxel@redhat.com> In-Reply-To: <1411474417-9704-1-git-send-email-kraxel@redhat.com> References: <1411474417-9704-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 23/26] usb-serial: only check speed once at realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei Whatever the chardev is open or not, we should assure the speed is matched each other. So, call usb_check_attach() check speed. And then pass &error_abort at all calls to usb_device_attach(). Signed-off-by: Gonglei Reviewed-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann --- hw/usb/dev-serial.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 3784f4a..1cee450 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -451,7 +451,6 @@ static void usb_serial_read(void *opaque, const uint8_t *buf, int size) static void usb_serial_event(void *opaque, int event) { USBSerialState *s = opaque; - Error *local_err = NULL; switch (event) { case CHR_EVENT_BREAK: @@ -461,11 +460,7 @@ static void usb_serial_event(void *opaque, int event) break; case CHR_EVENT_OPENED: if (!s->dev.attached) { - usb_device_attach(&s->dev, &local_err); - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - } + usb_device_attach(&s->dev, &error_abort); } break; case CHR_EVENT_CLOSED: @@ -479,6 +474,7 @@ static void usb_serial_event(void *opaque, int event) static void usb_serial_realize(USBDevice *dev, Error **errp) { USBSerialState *s = DO_UPCAST(USBSerialState, dev, dev); + Error *local_err = NULL; usb_desc_create_serial(dev); usb_desc_init(dev); @@ -489,12 +485,18 @@ static void usb_serial_realize(USBDevice *dev, Error **errp) return; } + usb_check_attach(dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read, usb_serial_event, s); usb_serial_handle_reset(dev); if (s->cs->be_open && !dev->attached) { - usb_device_attach(dev, errp); + usb_device_attach(dev, &error_abort); } } -- 1.8.3.1