|
 |
9290838 |
From 0e80029894a26f26a6641de5074ff680d98a6ffa Mon Sep 17 00:00:00 2001
|
|
 |
ca70dc3 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ca70dc3 |
Date: Thu, 27 Sep 2012 16:59:50 +0200
|
|
|
5544c1b |
Subject: [PATCH] usb-redir: Change usbredir_open_chardev into
|
|
|
ca70dc3 |
usbredir_create_parser
|
|
|
ca70dc3 |
|
|
|
ca70dc3 |
As we need to create the parser at more places.
|
|
|
ca70dc3 |
|
|
|
ca70dc3 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ca70dc3 |
---
|
|
|
ca70dc3 |
hw/usb/redirect.c | 11 +++++------
|
|
|
ca70dc3 |
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
ca70dc3 |
|
|
|
ca70dc3 |
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
|
|
|
ca70dc3 |
index 78e93a7..5d16aff 100644
|
|
|
ca70dc3 |
--- a/hw/usb/redirect.c
|
|
|
ca70dc3 |
+++ b/hw/usb/redirect.c
|
|
|
ca70dc3 |
@@ -872,15 +872,11 @@ static void usbredir_chardev_close_bh(void *opaque)
|
|
|
ca70dc3 |
}
|
|
|
ca70dc3 |
}
|
|
|
ca70dc3 |
|
|
|
ca70dc3 |
-static void usbredir_chardev_open(USBRedirDevice *dev)
|
|
|
ca70dc3 |
+static void usbredir_create_parser(USBRedirDevice *dev)
|
|
|
ca70dc3 |
{
|
|
|
ca70dc3 |
uint32_t caps[USB_REDIR_CAPS_SIZE] = { 0, };
|
|
|
ca70dc3 |
int flags = 0;
|
|
|
ca70dc3 |
|
|
|
ca70dc3 |
- /* Make sure any pending closes are handled (no-op if none pending) */
|
|
|
ca70dc3 |
- usbredir_chardev_close_bh(dev);
|
|
|
ca70dc3 |
- qemu_bh_cancel(dev->chardev_close_bh);
|
|
|
ca70dc3 |
-
|
|
|
ca70dc3 |
DPRINTF("creating usbredirparser\n");
|
|
|
ca70dc3 |
|
|
|
ca70dc3 |
dev->parser = qemu_oom_check(usbredirparser_create());
|
|
|
ca70dc3 |
@@ -992,7 +988,10 @@ static void usbredir_chardev_event(void *opaque, int event)
|
|
|
ca70dc3 |
switch (event) {
|
|
|
ca70dc3 |
case CHR_EVENT_OPENED:
|
|
|
ca70dc3 |
DPRINTF("chardev open\n");
|
|
|
ca70dc3 |
- usbredir_chardev_open(dev);
|
|
|
ca70dc3 |
+ /* Make sure any pending closes are handled (no-op if none pending) */
|
|
|
ca70dc3 |
+ usbredir_chardev_close_bh(dev);
|
|
|
ca70dc3 |
+ qemu_bh_cancel(dev->chardev_close_bh);
|
|
|
ca70dc3 |
+ usbredir_create_parser(dev);
|
|
|
ca70dc3 |
break;
|
|
|
ca70dc3 |
case CHR_EVENT_CLOSED:
|
|
|
ca70dc3 |
DPRINTF("chardev close\n");
|