summary refs log tree commit diff stats
path: root/include/qemu/compiler.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-08-14 18:06:44 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-08-14 18:06:44 +0100
commit6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97 (patch)
tree0dcdd090696a104284db8bcc28acc94410383eec /include/qemu/compiler.h
parent074a9925e1cfd659d5376dcaccd1436d3840e611 (diff)
parent8887f84c54f6e74124544d1700a205e5b6821b3d (diff)
downloadfocaccia-qemu-6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97.tar.gz
focaccia-qemu-6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97.zip
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri 14 Aug 2015 16:01:19 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  tests: test rx recovery from cont
  tests: introduce basic pci test for virtio-net
  net/vmxnet3: Fix incorrect debug message

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/compiler.h')
0 files changed, 0 insertions, 0 deletions