summary refs log tree commit diff stats
path: root/backends/hostmem-file.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-01-29 15:49:29 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-01-29 15:49:29 +0000
commit3701c07e63bb945137bf80fe35e7058ad3784c45 (patch)
treeafa03ec84821b5d9c9d86a9c38ba9863dd057b55 /backends/hostmem-file.c
parent5101d00d2f1138a73344dc4833587f76d7a5fa5c (diff)
parent4cea90be62f4f15a63e1a8f7d5d0958f79fdf290 (diff)
downloadfocaccia-qemu-3701c07e63bb945137bf80fe35e7058ad3784c45.tar.gz
focaccia-qemu-3701c07e63bb945137bf80fe35e7058ad3784c45.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:

- Fix iotests to respect configured Python binary

# gpg: Signature made Fri 29 Jan 2021 14:51:01 GMT
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  tests/Makefile.include: export PYTHON for check-block.sh
  iotests/testrunner: fix recognition of python tests

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