summary refs log tree commit diff stats
path: root/net/net.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-09-02 16:07:31 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-09-02 16:07:31 +0100
commitf2426947decc96bde4f9ea50097dac66a0a48acc (patch)
tree21ccb4e32e6b2b4471e14848c805b7f664ce744c /net/net.c
parent30eaca3acdf17d7bcbd1213eb149c02037edfb0b (diff)
parentaad4dce934649b3a398396fc2a76f215bb194ea4 (diff)
downloadfocaccia-qemu-f2426947decc96bde4f9ea50097dac66a0a48acc.tar.gz
focaccia-qemu-f2426947decc96bde4f9ea50097dac66a0a48acc.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci, pc fixes, features

A bunch of bugfixes - these will make sense for 2.1.1

Initial Intel IOMMU support.

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

# gpg: Signature made Tue 02 Sep 2014 16:05:04 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_net: start/stop guest notifiers properly
  pci: avoid losing config updates to MSI/MSIX cap regs
  virtio-net: don't run bh on vm stopped
  ioh3420: remove unused ioh3420_init() declaration
  vhost_net: cleanup start/stop condition
  intel-iommu: add IOTLB using hash table
  intel-iommu: add context-cache to cache context-entry
  intel-iommu: add supports for queued invalidation interface
  intel-iommu: fix coding style issues around in q35.c and machine.c
  intel-iommu: add Intel IOMMU emulation to q35 and add a machine option "iommu" as a switch
  intel-iommu: add DMAR table to ACPI tables
  intel-iommu: introduce Intel IOMMU (VT-d) emulation
  iommu: add is_write as a parameter to the translate function of MemoryRegionIOMMUOps

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