1 From 9ebfb490e04e1fe5466a4d31df17c5e6283236cb Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Thu, 27 Sep 2012 16:59:50 +0200
4 Subject: [PATCH] usb-redir: Change usbredir_open_chardev into
7 As we need to create the parser at more places.
9 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
11 hw/usb/redirect.c | 11 +++++------
12 1 file changed, 5 insertions(+), 6 deletions(-)
14 diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
15 index 78e93a7..5d16aff 100644
16 --- a/hw/usb/redirect.c
17 +++ b/hw/usb/redirect.c
18 @@ -872,15 +872,11 @@ static void usbredir_chardev_close_bh(void *opaque)
22 -static void usbredir_chardev_open(USBRedirDevice *dev)
23 +static void usbredir_create_parser(USBRedirDevice *dev)
25 uint32_t caps[USB_REDIR_CAPS_SIZE] = { 0, };
28 - /* Make sure any pending closes are handled (no-op if none pending) */
29 - usbredir_chardev_close_bh(dev);
30 - qemu_bh_cancel(dev->chardev_close_bh);
32 DPRINTF("creating usbredirparser\n");
34 dev->parser = qemu_oom_check(usbredirparser_create());
35 @@ -992,7 +988,10 @@ static void usbredir_chardev_event(void *opaque, int event)
37 case CHR_EVENT_OPENED:
38 DPRINTF("chardev open\n");
39 - usbredir_chardev_open(dev);
40 + /* Make sure any pending closes are handled (no-op if none pending) */
41 + usbredir_chardev_close_bh(dev);
42 + qemu_bh_cancel(dev->chardev_close_bh);
43 + usbredir_create_parser(dev);
45 case CHR_EVENT_CLOSED:
46 DPRINTF("chardev close\n");