diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-09-27 16:59:50 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2013-04-03 10:56:18 +0200 |
| commit | 37850b3784f5001d9ff4211cfaa49afdedee685f (patch) | |
| tree | 5a3c2b4fa6e488bce50fd143fe8954d1f0ca0d39 | |
| parent | e2ef05d415f324812983480cad3d21d73f4423ab (diff) | |
usb-redir: Change usbredir_open_chardev into usbredir_create_parser
As we need to create the parser at more places.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | hw/usb/redirect.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 78e93a708..5d16affc1 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -872,15 +872,11 @@ static void usbredir_chardev_close_bh(void *opaque) } } -static void usbredir_chardev_open(USBRedirDevice *dev) +static void usbredir_create_parser(USBRedirDevice *dev) { uint32_t caps[USB_REDIR_CAPS_SIZE] = { 0, }; int flags = 0; - /* Make sure any pending closes are handled (no-op if none pending) */ - usbredir_chardev_close_bh(dev); - qemu_bh_cancel(dev->chardev_close_bh); - DPRINTF("creating usbredirparser\n"); dev->parser = qemu_oom_check(usbredirparser_create()); @@ -992,7 +988,10 @@ static void usbredir_chardev_event(void *opaque, int event) switch (event) { case CHR_EVENT_OPENED: DPRINTF("chardev open\n"); - usbredir_chardev_open(dev); + /* Make sure any pending closes are handled (no-op if none pending) */ + usbredir_chardev_close_bh(dev); + qemu_bh_cancel(dev->chardev_close_bh); + usbredir_create_parser(dev); break; case CHR_EVENT_CLOSED: DPRINTF("chardev close\n"); |