From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 14 Feb 2022 19:54:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upstream' into staging
X-Git-Tag: v7.0.0-rc0~55
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upstream' into staging

Block layer patches

- Fix crash in blockdev-reopen with iothreads
- fdc-isa: Respect QOM properties when building AML

# gpg: Signature made Fri 11 Feb 2022 17:44:52 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/kwolf-gitlab/tags/for-upstream:
  hw/block/fdc-isa: Respect QOM properties when building AML
  iotests: Test blockdev-reopen with iothreads and throttling
  block: Lock AioContext for drain_end in blockdev-reopen

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f