[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-trivial] [PULL 14/23] virtio-blk: Remove useless condition around

From: Michael Tokarev
Subject: [Qemu-trivial] [PULL 14/23] virtio-blk: Remove useless condition around g_free()
Date: Sun, 7 May 2017 10:02:17 +0300

From: Fam Zheng <address@hidden>

Laszlo spotted and studied this wasteful "if". He pointed out:

The original virtio_blk_free_request needed an "if" as it accesses one
field, since 671ec3f05655 ("virtio-blk: Convert VirtIOBlockReq.elem to
pointer", 2014-06-11); later on in f897bf751fbd ("virtio-blk: embed
VirtQueueElement in VirtIOBlockReq", 2014-07-09) the field became
embedded, so the "if" became unnecessary (at which point we were using
g_slice_free(), but it is the same.

Now drop it.

Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
 hw/block/virtio-blk.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 98c16a7a9a..604d37dfc8 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -42,9 +42,7 @@ static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue 
 static void virtio_blk_free_request(VirtIOBlockReq *req)
-    if (req) {
-        g_free(req);
-    }
+    g_free(req);
 static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]