summary refs log tree commit diff stats
path: root/scripts/simpletrace.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-08-11 15:11:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-08-11 15:11:50 +0100
commit9db6ffc76676731a25a5538ab71e8ca6ac234f80 (patch)
treecdfb74c60955bdc2490338a75fd8976777e94014 /scripts/simpletrace.py
parent95766c2cd04395e5712b4d5967b3251f35d537df (diff)
parent8565c3ab537e78f3e69977ec2c609dc9417a806e (diff)
downloadfocaccia-qemu-9db6ffc76676731a25a5538ab71e8ca6ac234f80.tar.gz
focaccia-qemu-9db6ffc76676731a25a5538ab71e8ca6ac234f80.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc3

# gpg: Signature made Fri 11 Aug 2017 15:02:58 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-iotests: fix 185
  file-posix: Do runtime check for ofd lock API
  osdep: Add runtime OFD lock detection
  qcow2: Check failure of bdrv_getlength()
  qcow2: Drop debugging dump_refcounts()
  vpc: Check failure of bdrv_getlength()
  tests/multiboot: Fix whitespace failure

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