From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eric Auger <eric.auger@redhat.com>, David Hildenbrand <david@redhat.com>
Subject: [PATCH 4/4] error: Use error_fatal to simplify obvious fatal errors (again)
Date: Wed, 22 Jul 2020 10:40:48 +0200 [thread overview]
Message-ID: <20200722084048.1726105-5-armbru@redhat.com> (raw)
In-Reply-To: <20200722084048.1726105-1-armbru@redhat.com>
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>
---
exec.c | 11 +++--------
hw/s390x/s390-virtio-ccw.c | 6 +-----
hw/virtio/vhost.c | 10 +++-------
3 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/exec.c b/exec.c
index 6f381f98e2..61b46a62f8 100644
--- a/exec.c
+++ b/exec.c
@@ -627,8 +627,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);
@@ -657,12 +656,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu,
0,
HWADDR_MAX,
iommu_idx);
- ret = memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n,
- &err);
- if (ret) {
- error_report_err(err);
- exit(1);
- }
+ memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n,
+ &error_fatal);
}
if (!notifier->active) {
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 8cc2f25d8a..4fc92559fb 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -170,11 +170,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 1a1384e7a6..cc8c1f89d5 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? */
}
--
2.26.2
next prev parent reply other threads:[~2020-07-22 8:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 8:40 [PATCH 0/4] error: Mechanical fixes & cleanups Markus Armbruster
2020-07-22 8:40 ` [PATCH 1/4] coccinelle/err-bad-newline: Fix for Python 3, and add patterns Markus Armbruster
2020-07-22 13:28 ` Eric Blake
2020-07-22 8:40 ` [PATCH 2/4] error: Strip trailing '\n' from error string arguments (again) Markus Armbruster
2020-07-22 10:04 ` Philippe Mathieu-Daudé
2020-07-22 10:33 ` David Gibson
2020-07-22 12:46 ` Peter Xu
2020-07-22 8:40 ` [PATCH 3/4] error: Remove NULL checks on error_propagate() calls (again) Markus Armbruster
2020-07-22 13:31 ` Eric Blake
2020-07-23 9:14 ` Markus Armbruster
2020-07-23 13:38 ` Markus Armbruster
2020-07-23 13:42 ` Eric Blake
2020-07-22 8:40 ` Markus Armbruster [this message]
2020-07-22 8:42 ` [PATCH 4/4] error: Use error_fatal to simplify obvious fatal errors (again) David Hildenbrand
2020-07-24 13:45 ` [PATCH 0/4] error: Mechanical fixes & cleanups Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200722084048.1726105-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=david@redhat.com \
--cc=eric.auger@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).