VLANClientState *vc;
QEMUTimer *tx_timer;
int tx_timer_active;
+ struct {
+ VirtQueueElement elem;
+ ssize_t len;
+ } async_tx;
int mergeable_rx_bufs;
uint8_t promisc;
uint8_t allmulti;
VirtIONet *n = to_virtio_net(vdev);
qemu_flush_queued_packets(n->vc);
+
+ /* We now have RX buffers, signal to the IO thread to break out of the
+ * select to re-poll the tap file descriptor */
+ qemu_notify_event();
}
static int do_virtio_net_can_receive(VirtIONet *n, int bufsize)
return size;
}
+static void virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq);
+
+static void virtio_net_tx_complete(VLANClientState *vc, ssize_t len)
+{
+ VirtIONet *n = vc->opaque;
+
+ virtqueue_push(n->tx_vq, &n->async_tx.elem, n->async_tx.len);
+ virtio_notify(&n->vdev, n->tx_vq);
+
+ n->async_tx.elem.out_num = n->async_tx.len = 0;
+
+ virtio_queue_set_notification(n->tx_vq, 1);
+ virtio_net_flush_tx(n, n->tx_vq);
+}
+
/* TX */
static void virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq)
{
if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK))
return;
+ if (n->async_tx.elem.out_num) {
+ virtio_queue_set_notification(n->tx_vq, 0);
+ return;
+ }
+
while (virtqueue_pop(vq, &elem)) {
- ssize_t len = 0;
+ ssize_t ret, len = 0;
unsigned int out_num = elem.out_num;
struct iovec *out_sg = &elem.out_sg[0];
unsigned hdr_len;
len += hdr_len;
}
- len += qemu_sendv_packet(n->vc, out_sg, out_num);
+ ret = qemu_sendv_packet_async(n->vc, out_sg, out_num,
+ virtio_net_tx_complete);
+ if (ret == 0) {
+ virtio_queue_set_notification(n->tx_vq, 0);
+ n->async_tx.elem = elem;
+ n->async_tx.len = len;
+ return;
+ }
+
+ len += ret;
virtqueue_push(vq, &elem, len);
virtio_notify(&n->vdev, vq);
{
VirtIONet *n = vc->opaque;
+ qemu_purge_queued_packets(vc);
+
unregister_savevm("virtio-net", n);
qemu_free(n->mac_table.macs);
n->mac_table.macs = qemu_mallocz(MAC_TABLE_ENTRIES * ETH_ALEN);
n->vlans = qemu_mallocz(MAX_VLAN >> 3);
+ if (dev->nd->nvectors == NIC_NVECTORS_UNSPECIFIED)
+ n->vdev.nvectors = 3;
+ else
+ n->vdev.nvectors = dev->nd->nvectors;
register_savevm("virtio-net", virtio_net_id++, VIRTIO_NET_VM_VERSION,
virtio_net_save, virtio_net_load, n);