diff options
Diffstat (limited to 'hw/usb-net.c')
| -rw-r--r-- | hw/usb-net.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hw/usb-net.c b/hw/usb-net.c index 9e6442506f..0e80ca6923 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1369,17 +1369,17 @@ static int usb_net_handle_data(USBDevice *dev, USBPacket *p) return ret; } -static void usbnet_receive(void *opaque, const uint8_t *buf, int size) +static ssize_t usbnet_receive(VLANClientState *vc, const uint8_t *buf, size_t size) { - USBNetState *s = opaque; + USBNetState *s = vc->opaque; struct rndis_packet_msg_type *msg; if (s->rndis) { msg = (struct rndis_packet_msg_type *) s->in_buf; if (!s->rndis_state == RNDIS_DATA_INITIALIZED) - return; + return -1; if (size + sizeof(struct rndis_packet_msg_type) > sizeof(s->in_buf)) - return; + return -1; memset(msg, 0, sizeof(struct rndis_packet_msg_type)); msg->MessageType = cpu_to_le32(RNDIS_PACKET_MSG); @@ -1398,16 +1398,17 @@ static void usbnet_receive(void *opaque, const uint8_t *buf, int size) s->in_len = size + sizeof(struct rndis_packet_msg_type); } else { if (size > sizeof(s->in_buf)) - return; + return -1; memcpy(s->in_buf, buf, size); s->in_len = size; } s->in_ptr = 0; + return size; } -static int usbnet_can_receive(void *opaque) +static int usbnet_can_receive(VLANClientState *vc) { - USBNetState *s = opaque; + USBNetState *s = vc->opaque; if (s->rndis && !s->rndis_state == RNDIS_DATA_INITIALIZED) return 1; @@ -1458,8 +1459,9 @@ USBDevice *usb_net_init(NICInfo *nd) pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Network Interface"); s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - usbnet_receive, usbnet_can_receive, + usbnet_receive, + NULL, usbnet_cleanup, s); qemu_format_nic_info_str(s->vc, s->mac); |