From patchwork Mon Aug 17 12:39:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 42026 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7HCfJ5N017174 for ; Mon, 17 Aug 2009 12:41:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753606AbZHQMlO (ORCPT ); Mon, 17 Aug 2009 08:41:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752409AbZHQMlO (ORCPT ); Mon, 17 Aug 2009 08:41:14 -0400 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 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7HCf2Un010794; Mon, 17 Aug 2009 08:41:02 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7HCf1ot005397; Mon, 17 Aug 2009 08:41:01 -0400 Received: from redhat.com (vpn-6-31.tlv.redhat.com [10.35.6.31]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7HCewb1019825; Mon, 17 Aug 2009 08:40:59 -0400 Date: Mon, 17 Aug 2009 15:39:43 +0300 From: "Michael S. Tsirkin" To: Gregory Haskins Cc: Anthony Liguori , alacrityvm-devel@lists.sourceforge.net, "kvm@vger.kernel.org" Subject: [PATCH] vhost: fix up after tx timer removal Message-ID: <20090817123943.GA10731@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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;