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

usb-redir: Add a usbredir_reject_device helper function

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-09-03 11:53:28 +02:00 committed by Gerd Hoffmann
parent 0fde3b7a82
commit 910c1e6b14
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/usb/redirect.c
View File

@ -811,17 +811,22 @@ static void usbredir_chardev_open(USBRedirDevice *dev)
usbredirparser_do_write(dev->parser); usbredirparser_do_write(dev->parser);
} }
static void usbredir_do_attach(void *opaque) static void usbredir_reject_device(USBRedirDevice *dev)
{ {
USBRedirDevice *dev = opaque;
if (usb_device_attach(&dev->dev) != 0) {
usbredir_device_disconnect(dev); usbredir_device_disconnect(dev);
if (usbredirparser_peer_has_cap(dev->parser, usb_redir_cap_filter)) { if (usbredirparser_peer_has_cap(dev->parser, usb_redir_cap_filter)) {
usbredirparser_send_filter_reject(dev->parser); usbredirparser_send_filter_reject(dev->parser);
usbredirparser_do_write(dev->parser); usbredirparser_do_write(dev->parser);
} }
} }
static void usbredir_do_attach(void *opaque)
{
USBRedirDevice *dev = opaque;
if (usb_device_attach(&dev->dev) != 0) {
usbredir_reject_device(dev);
}
} }
/* /*
@ -986,11 +991,7 @@ static int usbredir_check_filter(USBRedirDevice *dev)
return 0; return 0;
error: error:
usbredir_device_disconnect(dev); usbredir_reject_device(dev);
if (usbredirparser_peer_has_cap(dev->parser, usb_redir_cap_filter)) {
usbredirparser_send_filter_reject(dev->parser);
usbredirparser_do_write(dev->parser);
}
return -1; return -1;
} }