summary refs log tree commit diff stats
path: root/scripts/minikconf.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-02-10 17:08:51 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-02-10 17:08:51 +0000
commit81a23caf47956778c5a5056ad656d1ef92bf9659 (patch)
treed36bbf53bef8fcffde6fbe8ccb0b711235453e3a /scripts/minikconf.py
parent2b8a51cdb3e8d15a5c35de7a2e76a813ae7358f0 (diff)
parent11a18c84db4a71497d3d40769688a01b6f64b2ad (diff)
downloadfocaccia-qemu-81a23caf47956778c5a5056ad656d1ef92bf9659.tar.gz
focaccia-qemu-81a23caf47956778c5a5056ad656d1ef92bf9659.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request

# gpg: Signature made Mon 10 Feb 2020 09:23:42 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host
  block: fix crash on zero-length unaligned write and read

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