OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Markus Armbruster 2020-07-22 10:40:48 +02:00
parent 2155ceaf25
commit 805d44961b
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exec.c
View File

@ -623,8 +623,7 @@ static void tcg_register_iommu_notifier(CPUState *cpu,
*/
MemoryRegion *mr = MEMORY_REGION(iommu_mr);
TCGIOMMUNotifier *notifier;
Error *err = NULL;
int i, ret;
int i;
for (i = 0; i < cpu->iommu_notifiers->len; i++) {
notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i);
@ -653,12 +652,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu,
0,
HWADDR_MAX,
iommu_idx);
ret = memory_region_register_iommu_notifier(notifier->mr, &notifier->n,
&err);
if (ret) {
error_report_err(err);
exit(1);
}
memory_region_register_iommu_notifier(notifier->mr, &notifier->n,
&error_fatal);
}
if (!notifier->active) {

7
hw/s390x/s390-virtio-ccw.c
View File

@ -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 */

10
hw/virtio/vhost.c
View File

@ -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? */
}