diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-21 20:12:37 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-21 20:12:37 +0100 |
commit | 206d0c24361a083fbdcb2cc86fb75dc8b7f251a2 (patch) | |
tree | 75dd4919f09372b4ef9928084ece6c7999ff76fc /target-i386/trace-events | |
parent | 7239247a2ba2fd1c269edda3b6fd816c5fd51baf (diff) | |
parent | bc38ee10fc26338e21c01485540f815be1f3db28 (diff) | |
download | qemu-206d0c24361a083fbdcb2cc86fb75dc8b7f251a2.zip qemu-206d0c24361a083fbdcb2cc86fb75dc8b7f251a2.tar.gz qemu-206d0c24361a083fbdcb2cc86fb75dc8b7f251a2.tar.bz2 |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, pci, virtio: new features, cleanups, fixes
- interrupt remapping for intel iommus
- a bunch of virtio cleanups
- fixes all over the place
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 21 Jul 2016 18:49:30 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: (57 commits)
intel_iommu: avoid unnamed fields
virtio: Update migration docs
virtio-gpu: Wrap in vmstate
virtio-gpu: Use migrate_add_blocker for virgl migration blocking
virtio-input: Wrap in vmstate
9pfs: Wrap in vmstate
virtio-serial: Wrap in vmstate
virtio-net: Wrap in vmstate
virtio-balloon: Wrap in vmstate
virtio-rng: Wrap in vmstate
virtio-blk: Wrap in vmstate
virtio-scsi: Wrap in vmstate
virtio: Migration helper function and macro
virtio-serial: Remove old migration version support
virtio-net: Remove old migration version support
virtio-scsi: Replace HandleOutput typedef
Revert "mirror: Workaround for unexpected iohandler events during completion"
virtio-scsi: Call virtio_add_queue_aio
virtio-blk: Call virtio_add_queue_aio
virtio: Introduce virtio_add_queue_aio
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/trace-events')
-rw-r--r-- | target-i386/trace-events | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/target-i386/trace-events b/target-i386/trace-events new file mode 100644 index 0000000..ccc49e3 --- /dev/null +++ b/target-i386/trace-events @@ -0,0 +1,7 @@ +# See docs/trace-events.txt for syntax documentation. + +# target-i386/kvm.c +kvm_x86_fixup_msi_error(uint32_t gsi) "VT-d failed to remap interrupt for GSI %" PRIu32 +kvm_x86_add_msi_route(int virq) "Adding route entry for virq %d" +kvm_x86_remove_msi_route(int virq) "Removing route entry for virq %d" +kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" |