summaryrefslogtreecommitdiff
path: root/hw/isa
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-03-23 19:03:13 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-04-02 15:26:27 +0200
commitaf9e40aa8f36e30e89f16323b3d341ee59309b7e (patch)
tree7ba0eb254d708e533b3fd1e207856f07fba33fdd /hw/isa
parentb8a86c4ac4d04c106ba38fbd707041cba334a155 (diff)
downloadqemu-af9e40aa8f36e30e89f16323b3d341ee59309b7e.tar.gz
qemu-af9e40aa8f36e30e89f16323b3d341ee59309b7e.tar.bz2
qemu-af9e40aa8f36e30e89f16323b3d341ee59309b7e.zip
hw: Mark devices picking up block backends actively FIXME
Drives defined with if!=none are for board initialization to wire up. Board code calls drive_get() or similar to find them, and creates devices with their qdev drive properties set accordingly. Except a few devices go on a fishing expedition for a suitable backend instead of exposing a drive property for board code to set: they call driver_get() or drive_get_next() in their realize() or init() method to implicitly connect to the "next" backend with a certain interface type. Picking up backends that way works when the devices are created by board code. But it's inappropriate for -device or device_add. Not only is this inconsistent with how the other block device models work (they connect to a backend explicitly identified by a "drive" property), it breaks when the "next" backend has been picked up by the board already. Example: $ qemu-system-arm -S -M connex -pflash flash.img -device ssi-sd Aborted (core dumped) Mark them with suitable FIXME comments. Cc: Andrzej Zaborowski <balrogg@gmail.com> Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Cc: "Andreas Färber" <andreas.faerber@web.de> Cc: Michael Walle <michael@walle.cc> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hw/isa')
-rw-r--r--hw/isa/pc87312.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 40a11060a5..2849e8d367 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -319,11 +319,13 @@ static void pc87312_realize(DeviceState *dev, Error **errp)
d = DEVICE(isa);
qdev_prop_set_uint32(d, "iobase", get_fdc_iobase(s));
qdev_prop_set_uint32(d, "irq", 6);
+ /* FIXME use a qdev drive property instead of drive_get() */
drive = drive_get(IF_FLOPPY, 0, 0);
if (drive != NULL) {
qdev_prop_set_drive_nofail(d, "driveA",
blk_by_legacy_dinfo(drive));
}
+ /* FIXME use a qdev drive property instead of drive_get() */
drive = drive_get(IF_FLOPPY, 0, 1);
if (drive != NULL) {
qdev_prop_set_drive_nofail(d, "driveB",