From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCH] vhost: fix up after tx timer removal Date: Mon, 17 Aug 2009 15:39:43 +0300 Message-ID: <20090817123943.GA10731@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Anthony Liguori , alacrityvm-devel@lists.sourceforge.net, "kvm@vger.kernel.org" To: Gregory Haskins Return-path: Received: from mx2.redhat.com ([66.187.237.31]:55724 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbZHQMlO (ORCPT ); Mon, 17 Aug 2009 08:41:14 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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