| Message ID | 20200920152024.860172-1-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-vdpa: remove useless variable | expand |
Cc'ing qemu-trivial@ On 9/20/20 5:20 PM, Laurent Vivier wrote: > in vhost_vdpa_listener_region_del(), try_unmap is always true and so, > vhost_vdpa_dma_unmap() is always called. We can remove the variable > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/virtio/vhost-vdpa.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index 4580f3efd8a2..c6cae6a6cabf 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -153,7 +153,6 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, > hwaddr iova; > Int128 llend, llsize; > int ret; > - bool try_unmap = true; > > if (vhost_vdpa_listener_skipped_section(section)) { > return; > @@ -176,11 +175,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, > > llsize = int128_sub(llend, int128_make64(iova)); > > - if (try_unmap) { > - ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); > - if (ret) { > - error_report("vhost_vdpa dma unmap error!"); > - } > + ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); > + if (ret) { > + error_report("vhost_vdpa dma unmap error!"); > } > > memory_region_unref(section->mr); >
Laurent Vivier <lvivier@redhat.com> 于2020年9月20日周日 下午11:21写道： > > in vhost_vdpa_listener_region_del(), try_unmap is always true and so, > vhost_vdpa_dma_unmap() is always called. We can remove the variable > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/virtio/vhost-vdpa.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index 4580f3efd8a2..c6cae6a6cabf 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -153,7 +153,6 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, > hwaddr iova; > Int128 llend, llsize; > int ret; > - bool try_unmap = true; > > if (vhost_vdpa_listener_skipped_section(section)) { > return; > @@ -176,11 +175,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, > > llsize = int128_sub(llend, int128_make64(iova)); > > - if (try_unmap) { > - ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); > - if (ret) { > - error_report("vhost_vdpa dma unmap error!"); > - } > + ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); > + if (ret) { > + error_report("vhost_vdpa dma unmap error!"); > } > > memory_region_unref(section->mr); > -- > 2.26.2 > >
Le 20/09/2020 à 17:59, Philippe Mathieu-Daudé a écrit : > Cc'ing qemu-trivial@ > > On 9/20/20 5:20 PM, Laurent Vivier wrote: >> in vhost_vdpa_listener_region_del(), try_unmap is always true and so, >> vhost_vdpa_dma_unmap() is always called. We can remove the variable >> >> Signed-off-by: Laurent Vivier <lvivier@redhat.com> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > >> --- >> hw/virtio/vhost-vdpa.c | 9 +++------ >> 1 file changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c >> index 4580f3efd8a2..c6cae6a6cabf 100644 >> --- a/hw/virtio/vhost-vdpa.c >> +++ b/hw/virtio/vhost-vdpa.c >> @@ -153,7 +153,6 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, >> hwaddr iova; >> Int128 llend, llsize; >> int ret; >> - bool try_unmap = true; >> >> if (vhost_vdpa_listener_skipped_section(section)) { >> return; >> @@ -176,11 +175,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, >> >> llsize = int128_sub(llend, int128_make64(iova)); >> >> - if (try_unmap) { >> - ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); >> - if (ret) { >> - error_report("vhost_vdpa dma unmap error!"); >> - } >> + ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); >> + if (ret) { >> + error_report("vhost_vdpa dma unmap error!"); >> } >> >> memory_region_unref(section->mr); >> > > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 4580f3efd8a2..c6cae6a6cabf 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -153,7 +153,6 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, hwaddr iova; Int128 llend, llsize; int ret; - bool try_unmap = true; if (vhost_vdpa_listener_skipped_section(section)) { return; @@ -176,11 +175,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, llsize = int128_sub(llend, int128_make64(iova)); - if (try_unmap) { - ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); - if (ret) { - error_report("vhost_vdpa dma unmap error!"); - } + ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); + if (ret) { + error_report("vhost_vdpa dma unmap error!"); } memory_region_unref(section->mr);
in vhost_vdpa_listener_region_del(), try_unmap is always true and so, vhost_vdpa_dma_unmap() is always called. We can remove the variable Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- hw/virtio/vhost-vdpa.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)