[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/23] virtio-blk: Remove useless condition around g_
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [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
*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)
--
2.11.0
- [Qemu-devel] [PULL 00/23] Trivial patches for 2017-05-07, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 08/23] qga: fix compiler warnings (clang 5), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 12/23] use _Static_assert in QEMU_BUILD_BUG_ON, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 11/23] channel-file: fix wrong parameter comments, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 01/23] Remove reduntant qemu: from error functions, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 09/23] util: Use g_malloc/g_free in envlist.c, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 14/23] virtio-blk: Remove useless condition around g_free(),
Michael Tokarev <=
- [Qemu-devel] [PULL 15/23] hw/core/generic-loader: Fix crash when running without CPU, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 23/23] tests: Remove redundant assignment, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 06/23] usb-ccid: make ccid_write_data_block() cope with null buffers, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 19/23] tests: Ignore another built executable (test-hmp), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 13/23] qemu-doc: Fix broken URLs of amnhltm.zip and dosidle210.zip, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 04/23] Add 'none' as type for drive's if option, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 02/23] ppc_booke: drop useless assignment, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 07/23] device_tree: fix compiler warnings (clang 5), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 22/23] MAINTAINERS: Update paths for AioContext implementation, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 10/23] block: Make 'replication_state' an enum, Michael Tokarev, 2017/05/07