summaryrefslogtreecommitdiffstats
path: root/hw/timer
diff options
context:
space:
mode:
authorPeter Maydell2018-09-28 14:35:26 +0200
committerPeter Maydell2018-09-28 14:35:26 +0200
commit099bea113ffba7380b45f174eb54d45d4b801ef2 (patch)
treed7215c1261f3a765b805ab1115fa0a2e885e0859 /hw/timer
parentMerge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.1-pull-re... (diff)
parentvmdk: align end of file to a sector boundary (diff)
downloadqemu-099bea113ffba7380b45f174eb54d45d4b801ef2.tar.gz
qemu-099bea113ffba7380b45f174eb54d45d4b801ef2.tar.xz
qemu-099bea113ffba7380b45f174eb54d45d4b801ef2.zip
Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging
Block and testing patches - Paolo's AIO fixes. - VMDK streamOptimized corner case fix - VM testing improvment on -cpu # gpg: Signature made Wed 26 Sep 2018 03:54:08 BST # gpg: using RSA key CA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/staging-pull-request: vmdk: align end of file to a sector boundary tests/vm: Use -cpu max rather than -cpu host aio-posix: do skip system call if ctx->notifier polling succeeds aio-posix: compute timeout before polling aio-posix: fix concurrent access to poll_disable_cnt Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer')
0 files changed, 0 insertions, 0 deletions