Message ID | 20190913083615.14719-4-eric.auger@redhat.com |
---|---|
State | New |
Headers | show |
Series | Allow memory_region_register_iommu_notifier() to fail | expand |
On Fri, Sep 13, 2019 at 10:36:12AM +0200, Eric Auger wrote: > memory_region_register_iommu_notifier now returns an error > in case of failure. Assert in such a case. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > --- > exec.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/exec.c b/exec.c > index 235d6bc883..da30251a2b 100644 > --- a/exec.c > +++ b/exec.c > @@ -692,7 +692,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu, > 0, > HWADDR_MAX, > iommu_idx); > - memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n); > + assert(!memory_region_register_iommu_notifier(notifier->mr, > + ¬ifier->n)); ret = memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n); assert(!ret); to avoid functions with side effects being called inside assert()'s, as assert()'s could be compiled as no-ops. Same comment for next patch. Thanks, drew > } > > if (!notifier->active) { > -- > 2.20.1 > >
diff --git a/exec.c b/exec.c index 235d6bc883..da30251a2b 100644 --- a/exec.c +++ b/exec.c @@ -692,7 +692,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 0, HWADDR_MAX, iommu_idx); - memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n); + assert(!memory_region_register_iommu_notifier(notifier->mr, + ¬ifier->n)); } if (!notifier->active) {
memory_region_register_iommu_notifier now returns an error in case of failure. Assert in such a case. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- exec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)