[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.3 01/10] s390x: Replace unchecked qdev_init() b
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.3 01/10] s390x: Replace unchecked qdev_init() by qdev_init_nofail() |
Date: |
Mon, 16 Mar 2015 11:08:09 +0100 |
From: Markus Armbruster <address@hidden>
s390_flic_init() is a helper to create and realize either
"s390-flic-kvm" or "s390-flic-qemu". When qdev_init() fails, it
complains to stderr and succeeds.
Except it can't actually fail, because the "s390-flic-qemu" is a dummy
without a realize method, and "s390-flic-kvm"'s realize can't fail,
even when the kernel device is really unavailable. Odd.
Replace qdev_init() by qdev_init_nofail() to make "can't fail" locally
obvious, and get rid of the unreachable error reporting.
Cc: Christian Borntraeger <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/intc/s390_flic.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 03c5e89..02e10b7 100644
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -30,7 +30,6 @@ S390FLICState *s390_get_flic(void)
void s390_flic_init(void)
{
DeviceState *dev;
- int r;
dev = s390_flic_kvm_create();
if (!dev) {
@@ -38,10 +37,7 @@ void s390_flic_init(void)
object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
OBJECT(dev), NULL);
}
- r = qdev_init(dev);
- if (r) {
- error_report("flic: couldn't create qdev");
- }
+ qdev_init_nofail(dev);
}
static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,
--
2.3.3
- [Qemu-devel] [PULL for-2.3 00/10] s390x: final updates, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 07/10] s390x/virtio-bus: Remove unused function s390_virtio_bus_console(), Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 01/10] s390x: Replace unchecked qdev_init() by qdev_init_nofail(),
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.3 03/10] virtio-ccw: assure BE accesses, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 06/10] s390x: CPACF: Handle key wrap machine options, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 08/10] s390x/ipl: remove dead code, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 05/10] s390x/kvm: make use of generic vm attribute check, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 02/10] s390x/kvm: Guest Migration TOD clock synchronization, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 04/10] kvm: encapsulate HAS_DEVICE for vm attrs, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 09/10] s390x/pci: fix length in sei_nt2 event, Cornelia Huck, 2015/03/16
- [Qemu-devel] [PULL for-2.3 10/10] s390x/config: Do not include full pci.mak, Cornelia Huck, 2015/03/16
- Re: [Qemu-devel] [PULL for-2.3 00/10] s390x: final updates, Peter Maydell, 2015/03/16