From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 2 Dec 2021 16:49:51 +0000 (-0800)
Subject: Merge tag 'ide-pull-request' of https://gitlab.com/jsnow/qemu into staging
X-Git-Tag: v6.2.0-rc4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a69254a2b320e31d3aa63ca910b7aa02efcd5492;p=thirdparty%2Fqemu.git

Merge tag 'ide-pull-request' of https://gitlab.com/jsnow/qemu into staging

Pull request

# gpg: Signature made Wed 01 Dec 2021 10:17:38 PM PST
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]

* tag 'ide-pull-request' of https://gitlab.com/jsnow/qemu:
  tests/qtest/fdc-test: Add a regression test for CVE-2021-20196
  hw/block/fdc: Kludge missing floppy drive to fix CVE-2021-20196
  hw/block/fdc: Extract blk_create_empty_drive()

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

a69254a2b320e31d3aa63ca910b7aa02efcd5492