Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 19 Jun 2015 10:30:57 +0000 (11:30 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 19 Jun 2015 10:30:57 +0000 (11:30 +0100)
commit89e9429c3cb42400f3a80890e0c20b18aa62a11d
treedef7ec8a0e0f12d04827b06086e129c13e2e273e
parent473a49460db0a90bfda046b8f3662b49f94098eb
parent1e7398a140f7a6bd9f5a438e7ad0f1ef50990e25
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, pci fixes, enhancements

Most notably this includes virtio cross-endian patches.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri Jun 19 11:18:05 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  vhost: enable vhost without without MSI-X
  pci: Don't register a specialized 'config_write' if default behavior is intended
  hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf()
  vhost_net: re-enable when cross endian
  vhost-net: tell tap backend about the vnet endianness
  tap: fix non-linux build
  tap: add VNET_LE/VNET_BE operations
  vhost: set vring endianness for legacy virtio
  virtio: introduce virtio_legacy_is_cross_endian()
  linux-headers: sync vhost.h
  vhost-user: part of virtio

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
MAINTAINERS
hw/net/vmxnet3.c
hw/virtio/vhost.c
net/net.c
net/tap.c
net/vhost-user.c