This is a rebase of v3 (http://lists.nongnu.org/archive/html/qemu-devel/2016-01/msg04471.html) on master made necessary because of a merge conflict in patch 3.
git-backport-diff against v3: Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/4:[----] [--] 'block: Add blk_dev_has_tray()' 002/4:[----] [--] 'blockdev: Fix 'change' for slot devices' 003/4:[0005] [FC] 'Revert "hw/block/fdc: Implement tray status"' 004/4:[----] [--] 'block/qapi: Emit tray_open only if there is a tray' Max Reitz (4): block: Add blk_dev_has_tray() blockdev: Fix 'change' for slot devices Revert "hw/block/fdc: Implement tray status" block/qapi: Emit tray_open only if there is a tray block/block-backend.c | 10 +++- block/qapi.c | 2 +- blockdev.c | 31 +++++++++++- hw/block/fdc.c | 23 +++------ include/block/block_int.h | 1 + qapi/block-core.json | 7 ++- tests/fdc-test.c | 2 - tests/qemu-iotests/067.out | 4 -- tests/qemu-iotests/118 | 117 ++++++++++++++------------------------------- 9 files changed, 86 insertions(+), 111 deletions(-) -- 2.7.0