[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/10] ide/isa: Replace unchecked qdev_init() by qdev
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 04/10] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail() |
Date: |
Tue, 24 Feb 2015 14:58:24 +0100 |
From: Markus Armbruster <address@hidden>
isa_ide_init()'s callers don't check for failure. isa_ide_init()
looks like it could fail, but since isa_ide_realizefn() can't fail, it
actually can't. Replace its qdev_init() by qdev_init_nofail() to make
it obvious.
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ide/isa.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index b084162..c0c4e1b 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -88,9 +88,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2,
int isairq,
qdev_prop_set_uint32(dev, "iobase", iobase);
qdev_prop_set_uint32(dev, "iobase2", iobase2);
qdev_prop_set_uint32(dev, "irq", isairq);
- if (qdev_init(dev) < 0) {
- return NULL;
- }
+ qdev_init_nofail(dev);
s = ISA_IDE(dev);
if (hd0) {
--
2.1.4
- [Qemu-devel] [PULL 00/10] QOM devices patch queue 2015-02-24, Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 08/10] serial: serial_hds_isa_init() shouldn't fail, Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 07/10] serial: Factor out common serial_hds_isa_init(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 01/10] qdev: Avoid type assertion in qdev_build_hotpluggable_device_list(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 02/10] qom: Fix typo, 'my_class_init' -> 'derived_class_init', Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 05/10] leon3: Replace unchecked qdev_init() by qdev_init_nofail(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 09/10] parallel: Factor out common parallel_hds_isa_init(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 06/10] etsec: Replace qdev_init() by qdev_init_nofail(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 04/10] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail(),
Andreas Färber <=
- [Qemu-devel] [PULL 03/10] qdev: Improve qdev_init_nofail()'s error reporting, Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 10/10] parallel: parallel_hds_isa_init() shouldn't fail, Andreas Färber, 2015/02/24
- Re: [Qemu-devel] [PULL 00/10] QOM devices patch queue 2015-02-24, Mark Cave-Ayland, 2015/02/24