diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-07-22 10:40:48 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-10-09 08:36:23 +0200 |
| commit | 805d44961b9015716cc13c1d3e49457af3970d82 (patch) | |
| tree | 3787668026828fef8cef138ee4f4fa366401dc5e /hw | |
| parent | 2155ceaf25662aa53cdb9dec3d7e9458bad4f0e0 (diff) | |
error: Use error_fatal to simplify obvious fatal errors (again)
Patch created mechanically by rerunning:
$ spatch --in-place --sp-file scripts/coccinelle/use-error_fatal.cocci \
--macro-file scripts/cocci-macro-file.h --use-gitgrep .
Variables now unused dropped manually.
Cc: Eric Auger <eric.auger@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200722084048.1726105-5-armbru@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 7 | ||||
| -rw-r--r-- | hw/virtio/vhost.c | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 28266a3a35..e52182f946 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -161,7 +161,6 @@ static void virtio_ccw_register_hcalls(void) static void s390_memory_init(MemoryRegion *ram) { MemoryRegion *sysmem = get_system_memory(); - Error *local_err = NULL; /* allocate RAM for core */ memory_region_add_subregion(sysmem, 0, ram); @@ -170,11 +169,7 @@ static void s390_memory_init(MemoryRegion *ram) * Configure the maximum page size. As no memory devices were created * yet, this is the page size of initial memory only. */ - s390_set_max_pagesize(qemu_maxrampagesize(), &local_err); - if (local_err) { - error_report_err(local_err); - exit(EXIT_FAILURE); - } + s390_set_max_pagesize(qemu_maxrampagesize(), &error_fatal); /* Initialize storage key device */ s390_skeys_init(); /* Initialize storage attributes device */ diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 68f0a75134..3077fa6ef5 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -712,9 +712,8 @@ static void vhost_iommu_region_add(MemoryListener *listener, iommu_listener); struct vhost_iommu *iommu; Int128 end; - int iommu_idx, ret; + int iommu_idx; IOMMUMemoryRegion *iommu_mr; - Error *err = NULL; if (!memory_region_is_iommu(section->mr)) { return; @@ -737,11 +736,8 @@ static void vhost_iommu_region_add(MemoryListener *listener, iommu->iommu_offset = section->offset_within_address_space - section->offset_within_region; iommu->hdev = dev; - ret = memory_region_register_iommu_notifier(section->mr, &iommu->n, &err); - if (ret) { - error_report_err(err); - exit(1); - } + memory_region_register_iommu_notifier(section->mr, &iommu->n, + &error_fatal); QLIST_INSERT_HEAD(&dev->iommu_list, iommu, iommu_next); /* TODO: can replay help performance here? */ } |