From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 19 Feb 2016 10:50:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=09125c5e76923aa22a72f43cb34b6e74ae7fe17f;p=qemu.git

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

vhost, virtio, pci, pxe

Fixes all over the place.
New tests for pxe.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 18 Feb 2016 15:46:39 GMT 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:
  tests/vhost-user-bridge: add scattering of incoming packets
  vhost-user interrupt management fixes
  rules: filter out irrelevant files
  change type of pci_bridge_initfn() to void
  dec: convert to realize()
  tests: add pxe e1000 and virtio-pci tests
  msix: fix msix_vector_masked
  virtio: optimize virtio_access_is_big_endian() for little-endian targets
  vhost: simplify vhost_needs_vring_endian()
  vhost: move virtio 1.0 check to cross-endian helper
  virtio: move cross-endian helper to vhost
  vhost-net: revert support of cross-endian vnet headers
  virtio-net: use the backend cross-endian capabilities

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

09125c5e76923aa22a72f43cb34b6e74ae7fe17f
diff --cc tests/vhost-user-bridge.c
index 9a1ad5a1bb,f5030b247b..f2b6c67e5b
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@@ -36,7 -45,9 +36,8 @@@
  #include <sys/mman.h>
  #include <sys/eventfd.h>
  #include <arpa/inet.h>
 -#include <ctype.h>
  #include <netdb.h>
+ #include <qemu/osdep.h>
  
  #include <linux/vhost.h>