aboutsummaryrefslogtreecommitdiff
path: root/hw/block
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2017-02-07 21:27:22 +0800
committerMichael Tokarev <mjt@tls.msk.ru>2017-05-10 10:19:23 +0300
commit1d29b5b0499c4d1f0415fadf94e41ed8964a7ed3 (patch)
tree8223092376446419c42d1b647575d5e9fa6183d8 /hw/block
parent3ba34a70223a78e89094c7f0a2f7cb6a667b8f9e (diff)
downloadqemu-1d29b5b0499c4d1f0415fadf94e41ed8964a7ed3.zip
qemu-1d29b5b0499c4d1f0415fadf94e41ed8964a7ed3.tar.gz
qemu-1d29b5b0499c4d1f0415fadf94e41ed8964a7ed3.tar.bz2
virtio-blk: Remove useless condition around g_free()
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 <lersek@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/block')
-rw-r--r--hw/block/virtio-blk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 98c16a7..604d37d 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 *vq,
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)