diff options
author | Markus Armbruster <armbru@redhat.com> | 2015-12-10 17:29:15 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 11:58:58 +0100 |
commit | 6231a6da9f40c3a33589402c9c57557e3a4f05ad (patch) | |
tree | 0c1c237b996c8cd416b87e9771e651a42506b911 /hw/isa/pc87312.c | |
parent | 007b06578ab6063d49b6834d95274c37387a1efb (diff) | |
download | qemu-6231a6da9f40c3a33589402c9c57557e3a4f05ad.tar.gz qemu-6231a6da9f40c3a33589402c9c57557e3a4f05ad.tar.bz2 qemu-6231a6da9f40c3a33589402c9c57557e3a4f05ad.zip |
hw: Inline the qdev_prop_set_drive_nofail() wrapper
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1449764955-10741-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/isa/pc87312.c')
-rw-r--r-- | hw/isa/pc87312.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 3b1fcec537..38030655f4 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -324,14 +324,14 @@ static void pc87312_realize(DeviceState *dev, Error **errp) /* 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)); + qdev_prop_set_drive(d, "driveA", blk_by_legacy_dinfo(drive), + &error_fatal); } /* 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", - blk_by_legacy_dinfo(drive)); + qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive), + &error_fatal); } qdev_init_nofail(d); s->fdc.dev = isa; |