summary refs log tree commit diff stats
path: root/hw/timer/arm_timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-08-02 09:49:02 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-08-02 09:49:02 +0100
commitd3d183a638d6a3ead515618a6547b3f80d39fcb9 (patch)
tree1321968e685e92cc2a0ba4bbb6032d93b9972658 /hw/timer/arm_timer.c
parent82d3d409b8b650164817ead0cb48298c6973d731 (diff)
parent3a3fcc75f92ab0d71ba0e7511af7dc575c4b4f6c (diff)
downloadfocaccia-qemu-d3d183a638d6a3ead515618a6547b3f80d39fcb9.tar.gz
focaccia-qemu-d3d183a638d6a3ead515618a6547b3f80d39fcb9.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, acpi, virtio: fixes, test speedup for rc1

Some fixes all over the place. Notably vhost-user gained a new message
to set endian-ness. Borderline for 2.10 but seems to be the only way to
fix legacy guests.  Also pc tests are run on kvm now. Not a fix at all
but doesn't touch qemu itself, so I merged it since I had to run these a
lot and I just got tired of waiting for these to finish.

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

# gpg: Signature made Tue 01 Aug 2017 22:36:47 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# 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:
  pc: acpi: force FADT rev1 for 440fx based machine types
  pc: make 'pc.rom' readonly when machine has PCI enabled
  vhost-user: fix watcher need be removed when vhost-user hotplug
  tests/bios-tables-test: Compiler warning fix
  accel: cleanup error output
  intel_iommu: use access_flags for iotlb
  intel_iommu: fix iova for pt
  vhost-user: fix legacy cross-endian configurations
  vhost: fix a memory leak
  tests: switch pxe and vm gen id tests to use kvm

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