All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Gregory Haskins <gregory.haskins@gmail.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>,
	alacrityvm-devel@lists.sourceforge.net,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>
Subject: [PATCH] vhost: fix up after tx timer removal
Date: Mon, 17 Aug 2009 15:39:43 +0300	[thread overview]
Message-ID: <20090817123943.GA10731@redhat.com> (raw)

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@redhat.com>
---
 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

                 reply	other threads:[~2009-08-17 12:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090817123943.GA10731@redhat.com \
    --to=mst@redhat.com \
    --cc=alacrityvm-devel@lists.sourceforge.net \
    --cc=anthony@codemonkey.ws \
    --cc=gregory.haskins@gmail.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.