[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 13/35] hw/intc/s390: Simplify error handling in kvm_s390_flic_r
From: |
Markus Armbruster |
Subject: |
[PULL v2 13/35] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize() |
Date: |
Wed, 18 Dec 2019 09:16:59 +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>
Message-Id: <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
- [PULL v2 14/35] tests-blockjob: Use error_free_or_abort(), (continued)
- [PULL v2 14/35] tests-blockjob: Use error_free_or_abort(), Markus Armbruster, 2019/12/18
- [PULL v2 07/35] hw/acpi: Fix legacy CPU plug error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 06/35] exec: Fix file_ram_alloc() error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 05/35] tests: Clean up initialization of Error *err variables, Markus Armbruster, 2019/12/18
- [PULL v2 10/35] qga: Fix guest-get-fsinfo error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 21/35] ppc: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 11/35] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 25/35] hw/i386/amd_iommu: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 19/35] qdev-monitor: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 22/35] 9pfs: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 13/35] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(),
Markus Armbruster <=
- [PULL v2 30/35] hw/tpm: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 27/35] monitor/qmp-cmds: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 26/35] qga: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 16/35] error: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 23/35] hw/core/qdev: cleanup Error ** variables, Markus Armbruster, 2019/12/18
- [PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init(), Markus Armbruster, 2019/12/18
- [PULL v2 31/35] hw/usb: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 24/35] block/snapshot: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/18
- [PULL v2 29/35] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/18