mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-serial: only check speed once at realize time

Browse Source 
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 <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2014-09-19 15:25:21 +08:00 committed by Gerd Hoffmann
parent 594a53607e
commit 7334d6507a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/usb/dev-serial.c
View File

@ -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) static void usb_serial_event(void *opaque, int event)
{ {
USBSerialState *s = opaque; USBSerialState *s = opaque;
Error *local_err = NULL;
switch (event) { switch (event) {
case CHR_EVENT_BREAK: case CHR_EVENT_BREAK:
@ -461,11 +460,7 @@ static void usb_serial_event(void *opaque, int event)
break; break;
case CHR_EVENT_OPENED: case CHR_EVENT_OPENED:
if (!s->dev.attached) { if (!s->dev.attached) {
usb_device_attach(&s->dev, &local_err); usb_device_attach(&s->dev, &error_abort);
if (local_err) {
qerror_report_err(local_err);
error_free(local_err);
}
} }
break; break;
case CHR_EVENT_CLOSED: 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) static void usb_serial_realize(USBDevice *dev, Error **errp)
{ {
USBSerialState *s = DO_UPCAST(USBSerialState, dev, dev); USBSerialState *s = DO_UPCAST(USBSerialState, dev, dev);
Error *local_err = NULL;
usb_desc_create_serial(dev); usb_desc_create_serial(dev);
usb_desc_init(dev); usb_desc_init(dev);
@ -489,12 +485,18 @@ static void usb_serial_realize(USBDevice *dev, Error **errp)
return; 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, qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read,
usb_serial_event, s); usb_serial_event, s);
usb_serial_handle_reset(dev); usb_serial_handle_reset(dev);
if (s->cs->be_open && !dev->attached) { if (s->cs->be_open && !dev->attached) {
usb_device_attach(dev, errp); usb_device_attach(dev, &error_abort);
} }
} }