[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/18] hw/intc/s390: Simplify error handling in kvm_s390_flic_
From: |
Markus Armbruster |
Subject: |
[PATCH v2 17/18] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize() |
Date: |
Wed, 4 Dec 2019 10:36:24 +0100 |
Cc: Halil Pasic <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Acked-by: Halil Pasic <address@hidden>
---
hw/intc/s390_flic_kvm.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index 30d50c2369..dddd33ea61 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -586,16 +586,17 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error
**errp)
KVM_S390_FLIC_GET_CLASS(dev)->parent_realize(dev, &err);
if (err) {
- goto fail;
+ error_propagate(errp, err);
+ return;
}
flic_state->fd = -1;
cd.type = KVM_DEV_TYPE_FLIC;
ret = kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd);
if (ret < 0) {
- error_setg_errno(&err, errno, "Creating the KVM device failed");
+ error_setg_errno(errp, errno, "Creating the KVM device failed");
trace_flic_create_device(errno);
- goto fail;
+ return;
}
flic_state->fd = cd.fd;
@@ -603,9 +604,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error
**errp)
test_attr.group = KVM_DEV_FLIC_CLEAR_IO_IRQ;
flic_state->clear_io_supported = !ioctl(flic_state->fd,
KVM_HAS_DEVICE_ATTR, test_attr);
- return;
-fail:
- error_propagate(errp, err);
}
static void kvm_s390_flic_reset(DeviceState *dev)
--
2.21.0
- [PATCH v2 02/18] crypto: Fix typo in QCryptoTLSSession's <example> comment, (continued)
- [PATCH v2 02/18] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/04
- [PATCH v2 04/18] tests: Clean up initialization of Error *err variables, Markus Armbruster, 2019/12/04
- [PATCH v2 11/18] s390x/event-facility: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 13/18] s390x/cpumodel: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 08/18] hw/ipmi: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 05/18] exec: Fix file_ram_alloc() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 17/18] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(),
Markus Armbruster <=
- [PATCH v2 01/18] crypto: Fix certificate file error handling crash bug, Markus Armbruster, 2019/12/04
- [PATCH v2 07/18] hw/core: Fix fit_load_fdt() error handling violations, Markus Armbruster, 2019/12/04
- [PATCH v2 03/18] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/04
- [PATCH v2 18/18] tests-blockjob: Use error_free_or_abort(), Markus Armbruster, 2019/12/04
- [PATCH v2 14/18] s390x/cpumodel: Fix query-cpu-model-FOO error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 06/18] hw/acpi: Fix legacy CPU plug error API violations, Markus Armbruster, 2019/12/04