Patchwork [1/2] usb-redir: Change usbredir_open_chardev into usbredir_create_parser

login
register
mail settings
Submitter Hans de Goede
Date Sept. 27, 2012, 3:25 p.m.
Message ID <1348759545-14645-1-git-send-email-hdegoede@redhat.com>
Download mbox | patch
Permalink /patch/187400/
State New
Headers show

Comments

Hans de Goede - Sept. 27, 2012, 3:25 p.m.
As we need to create the parser at more places.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/redirect.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
Gerd Hoffmann - Oct. 8, 2012, 2:10 p.m.
On 09/27/12 17:25, Hans de Goede wrote:
> As we need to create the parser at more places.

Both patches added to usb patch queue.

thanks,
  Gerd

Patch

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 78e93a7..5d16aff 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");