summary refs log tree commit diff stats
path: root/hw/net/vmxnet3.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-02-14 19:54:00 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-02-14 19:54:00 +0000
commit2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f (patch)
treec63fdaf36879b68a0f869377d478ed2ac793ec88 /hw/net/vmxnet3.c
parent50a75ff680ec8999baa0bffc49af8c6ad5c0035a (diff)
parentfdb8541b2e4f6ff60f435fbb5a5e1df20c275a86 (diff)
downloadfocaccia-qemu-2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f.tar.gz
focaccia-qemu-2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f.zip
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>
Diffstat (limited to 'hw/net/vmxnet3.c')
0 files changed, 0 insertions, 0 deletions