The following changes since commit 61fee7f45955cd0bf9b79be9fa9c7ebabb5e6a85:
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-testing-20200622' into staging (2020-06-22 20:50:10 +0100) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qdev-2020-06-23 for you to fetch changes up to 953cd66139b6e28fdc7cdbf28065a0a98ce7877c: sd/milkymist-memcard: Fix error API violation (2020-06-23 16:07:21 +0200) ---------------------------------------------------------------- Qdev patches for 2020-06-23 * Reject clash between -drive if=floppy and -global isa-fdc * Deprecate configuring floppies with -global isa-fdc * Deprecate -drive with bogus interface type * Reject drive property override instead of screwing up * Reject chardev property override instead of screwing up * Various error handling improvements * Extend iotests/172 ---------------------------------------------------------------- Markus Armbruster (16): iotests/172: Include "info block" in test output iotests/172: Cover empty filename and multiple use of drives iotests/172: Cover -global floppy.drive=... fdc: Reject clash between -drive if=floppy and -global isa-fdc fdc: Open-code fdctrl_init_isa() fdc: Deprecate configuring floppies with -global isa-fdc docs/qdev-device-use.txt: Update section "Default Devices" blockdev: Deprecate -drive with bogus interface type qdev: Eliminate get_pointer(), set_pointer() qdev: Improve netdev property override error a bit qdev: Reject drive property override qdev: Reject chardev property override qdev: Make qdev_prop_set_drive() match the other helpers arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error sd/milkymist-memcard: Fix error API violation docs/qdev-device-use.txt | 17 +- docs/system/deprecated.rst | 34 ++ include/hw/block/fdc.h | 2 +- include/hw/qdev-properties.h | 18 +- include/sysemu/blockdev.h | 2 + blockdev.c | 27 +- hw/arm/aspeed.c | 16 +- hw/arm/cubieboard.c | 2 +- hw/arm/exynos4210.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/msf2-som.c | 4 +- hw/arm/nseries.c | 4 +- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/sabrelite.c | 6 +- hw/arm/vexpress.c | 3 +- hw/arm/xilinx_zynq.c | 7 +- hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/xlnx-zcu102.c | 10 +- hw/block/fdc.c | 82 +++-- hw/block/nand.c | 2 +- hw/block/pflash_cfi01.c | 6 +- hw/block/pflash_cfi02.c | 2 +- hw/core/qdev-properties-system.c | 151 +++++---- hw/core/qdev-properties.c | 17 + hw/i386/pc.c | 8 +- hw/ide/qdev.c | 4 +- hw/isa/isa-superio.c | 18 +- hw/m68k/q800.c | 3 +- hw/microblaze/petalogix_ml605_mmu.c | 5 +- hw/ppc/pnv.c | 3 +- hw/ppc/spapr.c | 4 +- hw/scsi/scsi-bus.c | 2 +- hw/sd/milkymist-memcard.c | 2 +- hw/sd/pxa2xx_mmci.c | 15 +- hw/sd/sd.c | 2 +- hw/sd/ssi-sd.c | 3 +- hw/sparc64/sun4u.c | 9 +- hw/xtensa/xtfpga.c | 3 +- softmmu/vl.c | 8 + tests/qemu-iotests/172 | 27 +- tests/qemu-iotests/172.out | 656 ++++++++++++++++++++++++++++++++---- 44 files changed, 928 insertions(+), 270 deletions(-) -- 2.26.2