diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-28 14:22:04 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-28 14:22:04 +0100 |
| commit | 271fc190b309a47dc76cbe995e12d1bc6350f7ad (patch) | |
| tree | 1c73ad962be3d45e225e0e561f79498248aa60b3 /hw/s390x/ipl.c | |
| parent | 687f9f7834e30330fd952f1fe096518509ff8ff7 (diff) | |
| parent | 9362984f569a5b979714dfba556e370847d5fb87 (diff) | |
| download | qemu-271fc190b309a47dc76cbe995e12d1bc6350f7ad.zip | |
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/floppy-pull-request' into staging
FDC Pull request
# gpg: Signature made Fri 25 Jun 2021 13:54:17 BST
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jsnow-gitlab/tags/floppy-pull-request:
hw/block/fdc: Add description to floppy controllers
hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c
hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c
hw/block/fdc: Declare shared prototypes in fdc-internal.h
hw/block/fdc: Replace disabled fprintf() by trace event
hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x/ipl.c')
0 files changed, 0 insertions, 0 deletions