aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-10-16 17:39:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-10-16 17:39:01 +0100
commit7daf8f8d011cdd5d3e86930ed2bde969425c790c (patch)
tree739f3444d783df6306c599e1dfdf0eff8d757a5a /hw
parent6214addcc6b6bf6b444934833144bab10cbe6a1a (diff)
parente1c4269763999e3b359fff19ad170e0110d3b457 (diff)
downloadqemu-7daf8f8d011cdd5d3e86930ed2bde969425c790c.zip
qemu-7daf8f8d011cdd5d3e86930ed2bde969425c790c.tar.gz
qemu-7daf8f8d011cdd5d3e86930ed2bde969425c790c.tar.bz2
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches: - qemu-storage-daemon: Remove QemuOpts from --object parser - monitor: Fix order in monitor_cleanup() - Deprecate the sheepdog block driver # gpg: Signature made Thu 15 Oct 2020 15:48:10 BST # 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: block: deprecate the sheepdog block driver block: drop moderated sheepdog mailing list from MAINTAINERS file monitor: Fix order in monitor_cleanup() qemu-storage-daemon: Remove QemuOpts from --object parser qom: Add user_creatable_print_help_from_qdict() qom: Factor out helpers from user_creatable_print_help() keyval: Parse help options keyval: Fix parsing of ',' in value of implied key test-keyval: Demonstrate misparse of ',' with implied key keyval: Fix and clarify grammar Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions