From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33709 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ot2Fa-0004e4-3p for qemu-devel@nongnu.org; Tue, 07 Sep 2010 13:46:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ot2FZ-0000S2-07 for qemu-devel@nongnu.org; Tue, 07 Sep 2010 13:46:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36963) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ot2FY-0000Rv-Mx for qemu-devel@nongnu.org; Tue, 07 Sep 2010 13:46:28 -0400 Date: Tue, 7 Sep 2010 20:39:29 +0300 From: "Michael S. Tsirkin" Message-ID: <20100907173929.GA19025@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PULL] virtio, e1000 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori Hi Anthony, The tx timer patches seem to be very stable, and generally a good cleanup, and there's a fallback flag to get the old behaviour, so if there are regressions it will be easy for people to diagnose. Mergeable buffer support has been out for a long while with no comments. e1000 patch is very minor. Please pull into master. It might be a good idea to cherry-pick the e1000 patch onto the release branch. The following changes since commit ba5e7f82169f32ab8163c707d97c799ca09f8924: vnc: use bswapNN() rather than bswap_NN() (2010-09-04 10:11:32 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony Alex Williamson (4): virtio-net: Make tx_timer timeout configurable virtio-net: Limit number of packets sent per TX flush virtio-net: Rename tx_timer_active to tx_waiting virtio-net: Introduce a new bottom half packet TX Michael S. Tsirkin (4): qemu: e1000 fix TOR math tap: generalize code for different vnet header len tap: add APIs for vnet header length vhost_net: mergeable buffers support hw/e1000.c | 11 +++- hw/s390-virtio-bus.c | 8 +++- hw/s390-virtio-bus.h | 1 + hw/syborg_virtio.c | 8 +++- hw/vhost_net.c | 24 +++++++++- hw/virtio-net.c | 129 ++++++++++++++++++++++++++++++++++++++++--------- hw/virtio-net.h | 14 +++++ hw/virtio-pci.c | 8 +++- hw/virtio.h | 4 +- net/tap-aix.c | 9 ++++ net/tap-bsd.c | 9 ++++ net/tap-linux.c | 29 +++++++++++ net/tap-linux.h | 8 +++ net/tap-solaris.c | 9 ++++ net/tap-win32.c | 9 ++++ net/tap.c | 49 ++++++++++++++----- net/tap.h | 4 ++ 17 files changed, 287 insertions(+), 46 deletions(-) -- MST