diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-09 14:47:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-09 14:47:45 +0100 |
| commit | e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc (patch) | |
| tree | d57853edbd09d7db0129f179d1436037d045a4b2 /exec.c | |
| parent | b7092cda1b36ce687e65ab1831346f9529b781b8 (diff) | |
| parent | 805d44961b9015716cc13c1d3e49457af3970d82 (diff) | |
| download | focaccia-qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.tar.gz focaccia-qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-10-09' into staging
Error reporting patches for 2020-10-09 # gpg: Signature made Fri 09 Oct 2020 07:45:17 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-error-2020-10-09: error: Use error_fatal to simplify obvious fatal errors (again) error: Remove NULL checks on error_propagate() calls (again) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/exec.c b/exec.c index ec68f4a9ca..bca441f7fd 100644 --- a/exec.c +++ b/exec.c @@ -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, ¬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) { |