david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb-serial: only expose device in guest when the chardev is open

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2012-10-17 09:54:25 +02:00 committed by Anthony Liguori
parent 70330fb3da
commit da124e62de
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,6 +427,10 @@ static void usb_serial_handle_destroy(USBDevice *dev)
static int usb_serial_can_read(void *opaque) static int usb_serial_can_read(void *opaque)
{ {
USBSerialState *s = opaque; USBSerialState *s = opaque;
if (!s->dev.attached) {
return 0;
}
return RECV_BUF - s->recv_used; return RECV_BUF - s->recv_used;
} }
@ -469,8 +473,14 @@ static void usb_serial_event(void *opaque, int event)
case CHR_EVENT_FOCUS: case CHR_EVENT_FOCUS:
break; break;
case CHR_EVENT_OPENED: case CHR_EVENT_OPENED:
usb_serial_reset(s); if (!s->dev.attached) {
/* TODO: Reset USB port */ usb_device_attach(&s->dev);
}
break;
case CHR_EVENT_CLOSED:
if (s->dev.attached) {
usb_device_detach(&s->dev);
}
break; break;
} }
} }
@ -481,6 +491,7 @@ static int usb_serial_initfn(USBDevice *dev)
usb_desc_create_serial(dev); usb_desc_create_serial(dev);
usb_desc_init(dev); usb_desc_init(dev);
dev->auto_attach = 0;
if (!s->cs) { if (!s->cs) {
error_report("Property chardev is required"); error_report("Property chardev is required");
@ -490,6 +501,10 @@ static int usb_serial_initfn(USBDevice *dev)
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->opened && !dev->attached) {
usb_device_attach(dev);
}
return 0; return 0;
} }