summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaul Durrant <paul.durrant@citrix.com>2019-02-15 16:25:31 +0000
committerAnthony PERARD <anthony.perard@citrix.com>2019-02-28 17:21:12 +0000
commite02d94941d9c26035d5c2e5075c83afbe8c5eaef (patch)
treef2533f3d3a7149bf1afd7b93b58c5cc98a5d5088
parent711d13d5e2e160c1c3bcbd302af6df3980a99469 (diff)
downloadfocaccia-qemu-e02d94941d9c26035d5c2e5075c83afbe8c5eaef.tar.gz
focaccia-qemu-e02d94941d9c26035d5c2e5075c83afbe8c5eaef.zip
dataplane/xen-block: remove dead code
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>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20190215162533.19475-2-paul.durrant@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
-rw-r--r--hw/block/dataplane/xen-block.c5
1 files changed, 1 insertions, 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);