| Message ID | 20190215162533.19475-2-paul.durrant@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Coverity fixes | expand |
On 2/15/19 5:25 PM, Paul Durrant wrote: > The if() statement is clearly bogus (dead code which should have been > cleaned up when grant mapping was removed). "... was removed in 06454c24ad)." > > Spotted by Coverity: CID 1398635 > > While in the neighbourhood, add a missing 'fall through' annotation. > > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> > --- > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Cc: Stefano Stabellini <sstabellini@kernel.org> > Cc: Anthony Perard <anthony.perard@citrix.com> > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Max Reitz <mreitz@redhat.com> > --- > hw/block/dataplane/xen-block.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c > index c6a15da024..f1523c5b45 100644 > --- a/hw/block/dataplane/xen-block.c > +++ b/hw/block/dataplane/xen-block.c > @@ -281,10 +281,6 @@ static void xen_block_complete_aio(void *opaque, int ret) > break; > case BLKIF_OP_WRITE: > case BLKIF_OP_FLUSH_DISKCACHE: > - if (!request->req.nr_segments) { > - break; > - } > - break; > default: > break; > } > @@ -298,6 +294,7 @@ static void xen_block_complete_aio(void *opaque, int ret) > if (!request->req.nr_segments) { > break; > } > + /* fall through */ > case BLKIF_OP_READ: > if (request->status == BLKIF_RSP_OKAY) { > block_acct_done(blk_get_stats(dataplane->blk), &request->acct); >
On Fri, Feb 15, 2019 at 09:38:59PM +0100, Philippe Mathieu-Daudé wrote: > On 2/15/19 5:25 PM, Paul Durrant wrote: > > The if() statement is clearly bogus (dead code which should have been > > cleaned up when grant mapping was removed). > > "... was removed in 06454c24ad)." Actually, it looks like c6025bd197 should have remove the if statement. > > > > Spotted by Coverity: CID 1398635 > > > > While in the neighbourhood, add a missing 'fall through' annotation. > > > > Reported-by: Peter Maydell <peter.maydell@linaro.org> > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Acked-by: Anthony PERARD <anthony.perard@citrix.com> Thanks,
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index c6a15da024..f1523c5b45 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -281,10 +281,6 @@ static void xen_block_complete_aio(void *opaque, int ret) break; case BLKIF_OP_WRITE: case BLKIF_OP_FLUSH_DISKCACHE: - if (!request->req.nr_segments) { - break; - } - break; default: break; } @@ -298,6 +294,7 @@ static void xen_block_complete_aio(void *opaque, int ret) if (!request->req.nr_segments) { break; } + /* fall through */ case BLKIF_OP_READ: if (request->status == BLKIF_RSP_OKAY) { block_acct_done(blk_get_stats(dataplane->blk), &request->acct);
The if() statement is clearly bogus (dead code which should have been cleaned up when grant mapping was removed). Spotted by Coverity: CID 1398635 While in the neighbourhood, add a missing 'fall through' annotation. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paul Durrant <paul.durrant@citrix.com> --- Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Anthony Perard <anthony.perard@citrix.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Max Reitz <mreitz@redhat.com> --- hw/block/dataplane/xen-block.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)