Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: f81ca6b8c50d0393dc37c30de14f65066fe6a25c https://github.com/qemu/qemu/commit/f81ca6b8c50d0393dc37c30de14f65066fe6a25c Author: Markus Armbruster <arm...@redhat.com> Date: 2021-03-19 (Fri, 19 Mar 2021)
Changed paths: M docs/system/deprecated.rst Log Message: ----------- docs/system/deprecated: Fix note on fdc drive properties Commit 4a27a638e7 "fdc: Deprecate configuring floppies with -global isa-fdc" actually deprecated any use of floppy controller driver properties, not just with -global. Correct the deprecation note accordingly. Fixes: 4a27a638e718b445648de6b27c709353551d9b44 Signed-off-by: Markus Armbruster <arm...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20210309161214.1402527-2-arm...@redhat.com Signed-off-by: John Snow <js...@redhat.com> Commit: 2c6660b7a46f436beb3a237b682491c27745cd34 https://github.com/qemu/qemu/commit/2c6660b7a46f436beb3a237b682491c27745cd34 Author: Markus Armbruster <arm...@redhat.com> Date: 2021-03-19 (Fri, 19 Mar 2021) Changed paths: M docs/system/deprecated.rst M docs/system/removed-features.rst M hw/block/fdc.c M tests/qemu-iotests/172 M tests/qemu-iotests/172.out Log Message: ----------- fdc: Drop deprecated floppy configuration Drop the crap deprecated in commit 4a27a638e7 "fdc: Deprecate configuring floppies with -global isa-fdc" (v5.1.0). Signed-off-by: Markus Armbruster <arm...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20210309161214.1402527-3-arm...@redhat.com Signed-off-by: John Snow <js...@redhat.com> Commit: a3aff40e4f46267f5e0cf236f1a04d81fcde3bae https://github.com/qemu/qemu/commit/a3aff40e4f46267f5e0cf236f1a04d81fcde3bae Author: Markus Armbruster <arm...@redhat.com> Date: 2021-03-19 (Fri, 19 Mar 2021) Changed paths: M hw/block/fdc.c Log Message: ----------- fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() The previous commit rendered the name fdctrl_connect_drives() somewhat misleading. Get rid of it by inlining the (now pretty simple) function into its only caller. Signed-off-by: Markus Armbruster <arm...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20210309161214.1402527-4-arm...@redhat.com Signed-off-by: John Snow <js...@redhat.com> Commit: 4edda4a366a375b9e0be8a17c32dce7e5c5efa67 https://github.com/qemu/qemu/commit/4edda4a366a375b9e0be8a17c32dce7e5c5efa67 Author: Markus Armbruster <arm...@redhat.com> Date: 2021-03-19 (Fri, 19 Mar 2021) Changed paths: M blockdev.c M docs/system/deprecated.rst M docs/system/removed-features.rst M include/sysemu/blockdev.h M softmmu/vl.c Log Message: ----------- blockdev: Drop deprecated bogus -drive interface type Drop the crap deprecated in commit a1b40bda08 "blockdev: Deprecate -drive with bogus interface type" (v5.1.0). Signed-off-by: Markus Armbruster <arm...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20210309161214.1402527-5-arm...@redhat.com Signed-off-by: John Snow <js...@redhat.com> Commit: 84d406e0a047d83eb27f6345d5ed18e22a80b32a https://github.com/qemu/qemu/commit/84d406e0a047d83eb27f6345d5ed18e22a80b32a Author: Markus Armbruster <arm...@redhat.com> Date: 2021-03-19 (Fri, 19 Mar 2021) Changed paths: M hw/arm/xilinx_zynq.c M hw/audio/cs4231.c M hw/block/fdc.c M hw/char/etraxfs_ser.c M hw/cris/axis_dev88.c M hw/display/tcx.c M hw/intc/etraxfs_pic.c M hw/microblaze/xlnx-zynqmp-pmu.c M hw/misc/zynq_slcr.c M hw/sparc/sun4m.c M hw/timer/etraxfs_timer.c M include/hw/arm/armv7m.h M include/hw/arm/fsl-imx25.h M include/hw/arm/fsl-imx31.h M include/hw/arm/fsl-imx6.h M include/hw/arm/fsl-imx6ul.h M include/hw/arm/fsl-imx7.h M include/hw/arm/xlnx-zynqmp.h M include/hw/cris/etraxfs.h M include/hw/i386/ich9.h M include/hw/misc/grlib_ahb_apb_pnp.h M include/hw/misc/zynq-xadc.h M include/hw/register.h M include/hw/sparc/grlib.h M softmmu/vl.c M tests/vmstate-static-checker-data/dump1.json M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- hw: Replace anti-social QOM type names Several QOM type names contain ',': ARM,bitband-memory etraxfs,pic etraxfs,serial etraxfs,timer fsl,imx25 fsl,imx31 fsl,imx6 fsl,imx6ul fsl,imx7 grlib,ahbpnp grlib,apbpnp grlib,apbuart grlib,gptimer grlib,irqmp qemu,register SUNW,bpp SUNW,CS4231 SUNW,DBRI SUNW,DBRI.prom SUNW,fdtwo SUNW,sx SUNW,tcx xilinx,zynq_slcr xlnx,zynqmp xlnx,zynqmp-pmu-soc xlnx,zynq-xadc These are all device types. They can't be plugged with -device / device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one actually works. They *can* be used with -device / device_add to request help. Usability is poor, though: you have to double the comma, like this: $ qemu-system-x86_64 -device SUNW,,fdtwo,help Trap for the unwary. The fact that this was broken in device-introspect-test for more than six years until commit e27bd49876 fixed it demonstrates that "the unwary" includes seasoned developers. One QOM type name contains ' ': "ICH9 SMB". Because having to remember just one way to quote would be too easy. Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and ' ' by '-' in the other type names. Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-Id: <20210304140229.575481-2-arm...@redhat.com> Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Acked-by: Paolo Bonzini <pbonz...@redhat.com> Commit: 0c727a621a646504ccec2b08e55fd48030448466 https://github.com/qemu/qemu/commit/0c727a621a646504ccec2b08e55fd48030448466 Author: Markus Armbruster <arm...@redhat.com> Date: 2021-03-19 (Fri, 19 Mar 2021) Changed paths: M include/exec/memory.h Log Message: ----------- memory: Drop "qemu:" prefix from QOM memory region type names Almost all QOM type names consist only of letters, digits, '-', '_', and '.'. Just two contain ':': "qemu:memory-region" and "qemu:iommu-memory-region". Neither can be plugged with -object. Rename them to "memory-region" and "iommu-memory-region". Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-Id: <20210304140229.575481-3-arm...@redhat.com> Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Acked-by: Paolo Bonzini <pbonz...@redhat.com> Commit: b8796be5c06c6c3a1b07da1109f0042817e46d54 https://github.com/qemu/qemu/commit/b8796be5c06c6c3a1b07da1109f0042817e46d54 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2021-03-19 (Fri, 19 Mar 2021) Changed paths: M blockdev.c M docs/system/deprecated.rst M docs/system/removed-features.rst M hw/arm/xilinx_zynq.c M hw/audio/cs4231.c M hw/block/fdc.c M hw/char/etraxfs_ser.c M hw/cris/axis_dev88.c M hw/display/tcx.c M hw/intc/etraxfs_pic.c M hw/microblaze/xlnx-zynqmp-pmu.c M hw/misc/zynq_slcr.c M hw/sparc/sun4m.c M hw/timer/etraxfs_timer.c M include/exec/memory.h M include/hw/arm/armv7m.h M include/hw/arm/fsl-imx25.h M include/hw/arm/fsl-imx31.h M include/hw/arm/fsl-imx6.h M include/hw/arm/fsl-imx6ul.h M include/hw/arm/fsl-imx7.h M include/hw/arm/xlnx-zynqmp.h M include/hw/cris/etraxfs.h M include/hw/i386/ich9.h M include/hw/misc/grlib_ahb_apb_pnp.h M include/hw/misc/zynq-xadc.h M include/hw/register.h M include/hw/sparc/grlib.h M include/sysemu/blockdev.h M softmmu/vl.c M tests/qemu-iotests/172 M tests/qemu-iotests/172.out M tests/vmstate-static-checker-data/dump1.json M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-fdc-2021-03-16-v4' into staging QOM and fdc patches patches for 2021-03-16 # gpg: Signature made Fri 19 Mar 2021 05:56:36 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "arm...@redhat.com" # gpg: Good signature from "Markus Armbruster <arm...@redhat.com>" [full] # gpg: aka "Markus Armbruster <arm...@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qom-fdc-2021-03-16-v4: memory: Drop "qemu:" prefix from QOM memory region type names hw: Replace anti-social QOM type names blockdev: Drop deprecated bogus -drive interface type fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() fdc: Drop deprecated floppy configuration docs/system/deprecated: Fix note on fdc drive properties Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/cf6b56d4f210...b8796be5c06c