Re: [Qemu-devel] [PULL] virtio, e1000

[Anthony Liguori]

On 09/07/2010 12:39 PM, Michael S. Tsirkin wrote:
> 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.
>    


Pulled.  Thanks.

Regards,

Anthony Liguori


> 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(-)
>
>