diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-26 19:47:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-26 19:47:00 +0100 |
| commit | 7cfdc02dae0d2ff58c897496cfdbbafc0eda0f3f (patch) | |
| tree | 4ab986d748b8e4f914a388fe449366f9812b0f7d /hw/i386/x86-iommu.c | |
| parent | 3b71ec8516bb50e9a743645bf139571de0b39f61 (diff) | |
| parent | fb9f592623b0f9bb82a88d68d7921fb581918ef5 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pc: fixes and features
beginning of guest error handling for virtio devices
amd iommu
pc compat fixes
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 23 Sep 2016 23:02:09 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
hw/i386: AMD IOMMU IVRS table
hw/i386: Introduce AMD IOMMU
hw/i386/trace-events: Add AMD IOMMU trace events
hw/pci: Prepare for AMD IOMMU
virtio: handle virtqueue_get_head() errors
virtio: handle virtqueue_num_heads() errors
virtio: handle virtqueue_read_next_desc() errors
virtio: use unsigned int for virtqueue_get_avail_bytes() index
virtio: handle virtqueue_get_avail_bytes() errors
virtio: handle virtqueue_map_desc() errors
virtio: migrate vdev->broken flag
virtio: stop virtqueue processing if device is broken
virtio: fix stray tab character
target-i386: turn off CPU.l3-cache only for 2.7 and older machine types
pc: clean up COMPAT macro chaining
virtio: add check for descriptor's mapped address
tests: add /vhost-user/flags-mismatch test
tests: add a simple /vhost-user/multiqueue test
tests: add /vhost-user/connect-fail test
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/x86-iommu.c')
| -rw-r--r-- | hw/i386/x86-iommu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index ce26b2a71d..2278af7c32 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -71,6 +71,11 @@ X86IOMMUState *x86_iommu_get_default(void) return x86_iommu_default; } +IommuType x86_iommu_get_type(void) +{ + return x86_iommu_default->type; +} + static void x86_iommu_realize(DeviceState *dev, Error **errp) { X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); @@ -79,6 +84,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) if (x86_class->realize) { x86_class->realize(dev, errp); } + x86_iommu_set_default(X86_IOMMU_DEVICE(dev)); } |