If someone wants to combine tx timer removal patch with vhost patch, the following trivial fixup will be needed in qemu. Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> --- hw/virtio-net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 835f4e1..33e42bb 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -627,7 +627,7 @@ static int virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq, int enable_notify) int has_vnet_hdr = 0; #endif if (n->vhost_device) - return; + return num_packets; if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) return num_packets; -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html