Pull request (virtio updates)

[Tim Gardner]

Soren Hansen wrote:
> Hi guys!
>
> These changes brings our virtio code up to date with 2.6.25-rc7 and
> tweak configs accordingly.
>
> What we currently have is sort of a snapshot from before it was all
> merged into Linus' tree. Before they got accepted into mainline some of
> them were changed in subtle and sometimes not so subtle ways. To
> maintain my own sanity, I overcame this by removing all the virtio
> changes we carried so far, and reapplying all the patches as they
> appeared in Linus' tree, which is why this looks much for substantial
> than it actually is.
>
> As always, I've build-tested it, and have it running right now. It's all
> contained to virtualisation stuff apart from a non-intrusive change to
> skbuff which simply adds an extra function needed by the virtio-net
> driver.
>
> The following changes since commit 8ff53b941f128da28563c95e431ce03b4776f397:
>   Tim Gardner (1):
>         UBUNTU: Ubuntu-2.6.24-15.27
>
> are available in the git repository at:
>
>   git://kernel.ubuntu.com/soren/ubuntu-hardy.git master
>
> Al Viro (1):
>       virtio_pci iomem annotations
>
> Amit Shah (1):
>       virtio: Enable netpoll interface for netconsole logging
>
> Anthony Liguori (6):
>       virtio: Fix vring_init/vring_size to take unsigned long
>       virtio: PCI device
>       virtio: Use PCI revision field to indicate virtio PCI ABI version
>       virtio: Use spin_lock_irqsave/restore for virtio-pci
>       virtio_pci: unregister virtio device at device remove
>       virtio_net: remove overzealous printk
>
> Balaji Rao (1):
>       lguest: Reboot support
>
> Christian Borntraeger (7):
>       virtnet: remove double ether_setup
>       virtio_blk: provide getgeo
>       virtio_blk: Dont waste major numbers
>       virtio_blk: implement naming for vda-vdz,vdaa-vdzz,vdaaa-vdzzz
>       virtio net: fix oops on interface-up
>       virtio: fix race in enable_cb
>       virtio_net: Fix oops on early interrupts - introduced by virtio reset code
>
> Dor Laor (1):
>       virtio_net: parametrize the napi_weight for virtio receive queue.
>
> Glauber de Oliveira Costa (1):
>       lguest: adapt launcher to per-cpuness
>
> Jeremy Katz (1):
>       virtio: Fix sysfs bits to have proper block symlink
>
> Johann Felix Soden (1):
>       virtio: add missing #include <linux/delay.h>
>
> Paul Bolle (2):
>       lguest: Do not append space to guests kernel command line
>       lguest: lguest.txt documentation fix
>
> Rusty Russell (19):
>       virtio: Implement skb_partial_csum_set, for setting partial csums on untrusted packets.
>       virtio: simplify config mechanism.
>       virtio: explicit enable_cb/disable_cb rather than callback return.
>       virtio: configuration change callback
>       virtio: clarify NO_NOTIFY flag usage
>       virtio: remove unused id field from struct virtio_blk_outhdr
>       virtio: Net header needs hdr_len
>       virtio: Tweak virtio_net defines
>       virtio: populate network rings in the probe routine, not open
>       virtio: reset function
>       virtio: handle interrupts after callbacks turned off
>       virtio: Use the sg_phys convenience function.
>       virtio: Allow virtio to be modular and used by modules
>       virtio: flush buffers on open
>       virtio: free transmit skbs when notified, not on next xmit.
>       virtio: balloon driver
>       virtio: handle > 2 billion page balloon targets
>       lguest: Don't need comment terminator before disk section.
>       virtio: remove overzealous BUG_ON.
>
> Soren Hansen (4):
>       Ubuntu: Revert all our virtio changes
>       UBUNTU: Bring our virtio code up to date with 2.6.25-rc7
>       UBUNTU: Update configuration to match new virtio code
>       UBUNTU: Add missing virtio modules to d-i's storage-core-modules
>
> Tim Ansell (1):
>       lguest: Add puppies which where previously missing.
>
>  Documentation/lguest/lguest.c           |  123 ++++++-------
>  Documentation/lguest/lguest.txt         |   19 ++-
>  debian/config/amd64/config              |    6 +-
>  debian/config/i386/config               |    6 +-
>  debian/config/i386/config.386           |    5 +-
>  debian/config/i386/config.generic       |    5 +-
>  debian/config/i386/config.virtual       |    3 +-
>  debian/d-i/modules/storage-core-modules |    2 +
>  drivers/block/virtio_blk.c              |   69 ++++++--
>  drivers/char/hw_random/Kconfig          |    9 -
>  drivers/char/hw_random/Makefile         |    1 -
>  drivers/char/hw_random/virtio-rng.c     |  124 -------------
>  drivers/lguest/Makefile                 |    8 +
>  drivers/lguest/lguest_device.c          |   16 ++-
>  drivers/net/virtio_net.c                |  139 ++++++++-------
>  drivers/virtio/Kconfig                  |   15 ++-
>  drivers/virtio/Makefile                 |    1 +
>  drivers/virtio/virtio.c                 |   29 ++--
>  drivers/virtio/virtio_balloon.c         |  285 +++++++++++++++++++++++++++++++
>  drivers/virtio/virtio_pci.c             |   53 ++++--
>  drivers/virtio/virtio_ring.c            |   32 +---
>  include/linux/skbuff.h                  |    1 +
>  include/linux/virtio.h                  |   18 +-
>  include/linux/virtio_balloon.h          |   18 ++
>  include/linux/virtio_blk.h              |    2 -
>  include/linux/virtio_config.h           |    4 +
>  include/linux/virtio_net.h              |   12 +-
>  include/linux/virtio_pci.h              |    3 +
>  include/linux/virtio_rng.h              |    8 -
>  net/core/skbuff.c                       |   29 +++
>  30 files changed, 654 insertions(+), 391 deletions(-)
>  delete mode 100644 drivers/char/hw_random/virtio-rng.c
>  create mode 100644 drivers/virtio/virtio_balloon.c
>  create mode 100644 include/linux/virtio_balloon.h
>  delete mode 100644 include/linux/virtio_rng.h
>
>   
pulled. Its going to cause an ABI bump.

-- 
Tim Gardner tim.gardner at ubuntu.com