Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 5886844e0d6a242ded952c33a01fc41cfa79d7b8
https://github.com/qemu/qemu/commit/5886844e0d6a242ded952c33a01fc41cfa79d7b8
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: 2021-06-25 (Fri, 25 Jun 2021)
Changed paths:
M hw/isa/Kconfig
Log Message:
-----------
hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC
isa_superio_realize() calls isa_fdc_init_drives(), which is defined
in hw/block/fdc.c, so ISA_SUPERIO needs to select the FDC symbol.
Reported-by: John Snow <js...@redhat.com>
Reviewed-by: Thomas Huth <th...@redhat.com>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Message-id: 20210614193220.2007159-2-phi...@redhat.com
Fixes: c0ff3795143 ("Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c")
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Signed-off-by: John Snow <js...@redhat.com>
Commit: fbb11567fba6f452670b87a981d5f25ebece89ec
https://github.com/qemu/qemu/commit/fbb11567fba6f452670b87a981d5f25ebece89ec
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: 2021-06-25 (Fri, 25 Jun 2021)
Changed paths:
M hw/block/fdc.c
M hw/block/trace-events
Log Message:
-----------
hw/block/fdc: Replace disabled fprintf() by trace event
Reviewed-by: John Snow <js...@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Message-id: 20210614193220.2007159-3-phi...@redhat.com
Signed-off-by: John Snow <js...@redhat.com>
Commit: 5a5d2f3d260a5c3a2f00675c90744c0903fed116
https://github.com/qemu/qemu/commit/5a5d2f3d260a5c3a2f00675c90744c0903fed116
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: 2021-06-25 (Fri, 25 Jun 2021)
Changed paths:
M MAINTAINERS
A hw/block/fdc-internal.h
M hw/block/fdc.c
Log Message:
-----------
hw/block/fdc: Declare shared prototypes in fdc-internal.h
We want to extract ISA/SysBus code from the generic fdc.c file.
First, declare the prototypes we will access from the new units
into a new local header: "fdc-internal.h".
Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Message-id: 20210614193220.2007159-4-phi...@redhat.com
Signed-off-by: John Snow <js...@redhat.com>
Commit: 72ea60e4114272f3030455c214e86bcf1c8a1a9e
https://github.com/qemu/qemu/commit/72ea60e4114272f3030455c214e86bcf1c8a1a9e
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: 2021-06-25 (Fri, 25 Jun 2021)
Changed paths:
M MAINTAINERS
M hw/block/Kconfig
A hw/block/fdc-isa.c
M hw/block/fdc.c
M hw/block/meson.build
M hw/i386/Kconfig
M hw/isa/Kconfig
M hw/sparc64/Kconfig
Log Message:
-----------
hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c
Some machines use floppy controllers via the SysBus interface,
and don't need to pull in all the ISA code.
Extract the ISA specific code to a new unit: fdc-isa.c, and
add a new Kconfig symbol: "FDC_ISA".
This allows us to remove the FIXME from commit dd0ff8191ab
("isa: express SuperIO dependencies with Kconfig").
Reviewed-by: John Snow <js...@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Message-id: 20210614193220.2007159-5-phi...@redhat.com
Signed-off-by: John Snow <js...@redhat.com>
Commit: 1430759ec3e4cb92da224d739c914a0e8d78d786
https://github.com/qemu/qemu/commit/1430759ec3e4cb92da224d739c914a0e8d78d786
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: 2021-06-25 (Fri, 25 Jun 2021)
Changed paths:
M MAINTAINERS
M hw/block/Kconfig
A hw/block/fdc-sysbus.c
M hw/block/fdc.c
M hw/block/meson.build
M hw/block/trace-events
M hw/mips/Kconfig
M hw/sparc/Kconfig
Log Message:
-----------
hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c
Some machines use floppy controllers via the SysBus interface,
and don't need to pull in all the SysBus code.
Extract the SysBus specific code to a new unit: fdc-sysbus.c,
and add a new Kconfig symbol: "FDC_SYSBUS".
Reviewed-by: John Snow <js...@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Message-id: 20210614193220.2007159-6-phi...@redhat.com
Signed-off-by: John Snow <js...@redhat.com>
Commit: 9362984f569a5b979714dfba556e370847d5fb87
https://github.com/qemu/qemu/commit/9362984f569a5b979714dfba556e370847d5fb87
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: 2021-06-25 (Fri, 25 Jun 2021)
Changed paths:
M hw/block/fdc-isa.c
M hw/block/fdc-sysbus.c
Log Message:
-----------
hw/block/fdc: Add description to floppy controllers
Change the '-device help' output from:
Storage devices:
name "floppy", bus floppy-bus, desc "virtual floppy drive"
name "isa-fdc", bus ISA
to:
Storage devices:
name "floppy", bus floppy-bus, desc "virtual floppy drive"
name "isa-fdc", bus ISA, desc "virtual floppy controller"
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Message-id: 20210614193220.2007159-7-phi...@redhat.com
Signed-off-by: John Snow <js...@redhat.com>
Commit: 271fc190b309a47dc76cbe995e12d1bc6350f7ad
https://github.com/qemu/qemu/commit/271fc190b309a47dc76cbe995e12d1bc6350f7ad
Author: Peter Maydell <peter.mayd...@linaro.org>
Date: 2021-06-28 (Mon, 28 Jun 2021)
Changed paths:
M MAINTAINERS
M hw/block/Kconfig
A hw/block/fdc-internal.h
A hw/block/fdc-isa.c
A hw/block/fdc-sysbus.c
M hw/block/fdc.c
M hw/block/meson.build
M hw/block/trace-events
M hw/i386/Kconfig
M hw/isa/Kconfig
M hw/mips/Kconfig
M hw/sparc/Kconfig
M hw/sparc64/Kconfig
Log Message:
-----------
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) <js...@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.mayd...@linaro.org>
Compare: https://github.com/qemu/qemu/compare/687f9f7834e3...271fc190b309
