mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-redir: Add debugging to bufpq save / restore

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-12-14 14:35:46 +01:00 committed by Gerd Hoffmann
parent bd019b735a
commit e97f0aca79
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/usb/redirect.c
View File

@ -61,6 +61,7 @@ struct buf_packet {
}; };
struct endp_data { struct endp_data {
USBRedirDevice *dev;
uint8_t type; uint8_t type;
uint8_t interval; uint8_t interval;
uint8_t interface; /* bInterfaceNumber this ep belongs to */ uint8_t interface; /* bInterfaceNumber this ep belongs to */
@ -1070,6 +1071,7 @@ static void usbredir_init_endpoints(USBRedirDevice *dev)
usb_ep_init(&dev->dev); usb_ep_init(&dev->dev);
memset(dev->endpoint, 0, sizeof(dev->endpoint)); memset(dev->endpoint, 0, sizeof(dev->endpoint));
for (i = 0; i < MAX_ENDPOINTS; i++) { for (i = 0; i < MAX_ENDPOINTS; i++) {
dev->endpoint[i].dev = dev;
QTAILQ_INIT(&dev->endpoint[i].bufpq); QTAILQ_INIT(&dev->endpoint[i].bufpq);
} }
} }
@ -1783,22 +1785,26 @@ static const VMStateInfo usbredir_parser_vmstate_info = {
static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused) static void usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused)
{ {
struct endp_data *endp = priv; struct endp_data *endp = priv;
USBRedirDevice *dev = endp->dev;
struct buf_packet *bufp; struct buf_packet *bufp;
int remain = endp->bufpq_size; int i = 0;
qemu_put_be32(f, endp->bufpq_size); qemu_put_be32(f, endp->bufpq_size);
QTAILQ_FOREACH(bufp, &endp->bufpq, next) { QTAILQ_FOREACH(bufp, &endp->bufpq, next) {
DPRINTF("put_bufpq %d/%d len %d status %d\n", i + 1, endp->bufpq_size,
bufp->len, bufp->status);
qemu_put_be32(f, bufp->len); qemu_put_be32(f, bufp->len);
qemu_put_be32(f, bufp->status); qemu_put_be32(f, bufp->status);
qemu_put_buffer(f, bufp->data, bufp->len); qemu_put_buffer(f, bufp->data, bufp->len);
remain--; i++;
} }
assert(remain == 0); assert(i == endp->bufpq_size);
} }
static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused) static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused)
{ {
struct endp_data *endp = priv; struct endp_data *endp = priv;
USBRedirDevice *dev = endp->dev;
struct buf_packet *bufp; struct buf_packet *bufp;
int i; int i;
@ -1810,6 +1816,8 @@ static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused)
bufp->data = qemu_oom_check(malloc(bufp->len)); /* regular malloc! */ bufp->data = qemu_oom_check(malloc(bufp->len)); /* regular malloc! */
qemu_get_buffer(f, bufp->data, bufp->len); qemu_get_buffer(f, bufp->data, bufp->len);
QTAILQ_INSERT_TAIL(&endp->bufpq, bufp, next); QTAILQ_INSERT_TAIL(&endp->bufpq, bufp, next);
DPRINTF("get_bufpq %d/%d len %d status %d\n", i + 1, endp->bufpq_size,
bufp->len, bufp->status);
} }
return 0; return 0;
} }