[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] leon3: Replace unchecked qdev_init() by qdev_in
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 3/8] leon3: Replace unchecked qdev_init() by qdev_init_nofail() |
Date: |
Wed, 4 Feb 2015 18:33:03 +0100 |
grlib_irqmp_create(), grlib_gptimer_create() and
grlib_apbuart_create() are helpers to create and realize GRLIB
devices. Their only caller leon3_generic_hw_init() doesn't check for
failure. Only the first can actually fail, and only when the caller
fails to set up a pointer property, which is a programming error.
Replace qdev_init() by qdev_init_nofail().
Cc: Fabien Chouteau <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
include/hw/sparc/grlib.h | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h
index 470ce72..9a0db7b 100644
--- a/include/hw/sparc/grlib.h
+++ b/include/hw/sparc/grlib.h
@@ -55,9 +55,7 @@ DeviceState *grlib_irqmp_create(hwaddr base,
qdev_prop_set_ptr(dev, "set_pil_in", set_pil_in);
qdev_prop_set_ptr(dev, "set_pil_in_opaque", env);
- if (qdev_init(dev)) {
- return NULL;
- }
+ qdev_init_nofail(dev);
env->irq_manager = dev;
@@ -87,9 +85,7 @@ DeviceState *grlib_gptimer_create(hwaddr base,
qdev_prop_set_uint32(dev, "frequency", freq);
qdev_prop_set_uint32(dev, "irq-line", base_irq);
- if (qdev_init(dev)) {
- return NULL;
- }
+ qdev_init_nofail(dev);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
@@ -112,9 +108,7 @@ DeviceState *grlib_apbuart_create(hwaddr base,
dev = qdev_create(NULL, "grlib,apbuart");
qdev_prop_set_chr(dev, "chrdev", serial);
- if (qdev_init(dev)) {
- return NULL;
- }
+ qdev_init_nofail(dev);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
--
1.9.3
- [Qemu-devel] [PATCH 0/8] Cleanups around unchecked qdev_init(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 1/8] qdev: Improve qdev_init_nofail()'s error reporting, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 2/8] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 3/8] leon3: Replace unchecked qdev_init() by qdev_init_nofail(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 4/8] etsec: Replace qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 6/8] serial: serial_hds_isa_init() shouldn't fail, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 8/8] parallel: parallel_hds_isa_init() shouldn't fail, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 7/8] parallel: Factor out common parallel_hds_isa_init(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 5/8] serial: Factor out common serial_hds_isa_init(), Markus Armbruster, 2015/02/04